Claire 0b2c7cdb02 Merge commit 'fe2667bb0d3487a32b9da5250402a90482a85fe2' into glitch-soc/merge-upstream ... Conflicts: - `app/lib/content_security_policy.rb`: Conflict caused by glitch-soc's support for the extra `EXTRA_DATA_HOSTS` environment variable. Ported upstream's changes while keeping support for `EXTRA_DATA_HOSTS`.		2024-01-10 17:51:12 +01:00
..
v1	Merge commit 'fe2667bb0d3487a32b9da5250402a90482a85fe2' into glitch-soc/merge-upstream	2024-01-10 17:51:12 +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