Claire b3542ac57b Merge commit '1184887b012e863fbf44f65ef5c65e0049123c27' into glitch-soc/merge-upstream ...

Conflicts:
- `README.md`:
  Upstream updated its README, we have a completely different one.
  Kept our README.

2024-01-02 13:35:11 +01:00

..

v1

Merge commit '1184887b012e863fbf44f65ef5c65e0049123c27' into glitch-soc/merge-upstream

2024-01-02 13:35:11 +01:00

v2

Merge branch 'main' into glitch-soc/merge-upstream

2023-12-28 16:57:10 +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