Claire a5127d0ef8 Merge commit '24319836de6046fb2985ec1a24c30ad7d47584d7' into glitch-soc/merge-upstream ...

Conflicts:
- `config/routes/api.rb`:
  glitch-soc has an extra `:destroy` action on notifications for historical reasons.
  Kept it for now, while otherwise updating as upstream did.

2024-03-11 17:29:07 +01:00

..

v1

Merge commit '24319836de6046fb2985ec1a24c30ad7d47584d7' into glitch-soc/merge-upstream

2024-03-11 17:29:07 +01:00

v2

Merge commit '01ce9df88008cee705b7e02a4581802afa07c3df' into glitch-soc/merge-upstream

2024-01-24 20:42:53 +01:00

web

Improve spec coverage for api/web/push_subscriptions controller (#27858)

2023-11-15 13:14:51 +00:00

base_controller.rb

Handle negative offset param in api/v2/search (#28282)

2023-12-19 10:55:39 +00:00

oembed_controller.rb

Fix OEmbed leaking information about existence of non-public statuses (#12930)

2020-01-24 00:20:51 +01:00