Claire 876aa35350 Merge commit 'ffc5be4820' into glitch-soc/merge-upstream ... Conflicts: - `package.json`: Upstream updated a dependency that is on an adjacent line to a glitch-soc-only dependency in that file. Updated as upstream did. - `yarn.lock`: Upstream updated a dependency that is on an adjacent line to a glitch-soc-only dependency in that file. Updated as upstream did.		2024-03-19 19:21:12 +01:00
..
v1	Merge commit 'ffc5be4820' into glitch-soc/merge-upstream	2024-03-19 19:21:12 +01:00
v2	Merge commit '01ce9df880' 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	Move repeated insert_pagination_headers method to api base class (#29606)	2024-03-18 10:11:53 +00:00
oembed_controller.rb	Fix OEmbed leaking information about existence of non-public statuses (#12930)	2020-01-24 00:20:51 +01:00