Claire 6204d13a2e Merge commit 'ec71c02c4b028c3541742f023729aeb295a51559' into glitch-soc/merge-upstream ... Conflicts: - `Gemfile`: There was an extra newline in glitch-soc for some reason. Removed it.		2024-05-01 19:38:34 +02:00
..
v1	Merge commit 'ec71c02c4b028c3541742f023729aeb295a51559' into glitch-soc/merge-upstream	2024-05-01 19:38:34 +02: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	Add API::Pagination concern (#28826)	2024-04-17 09:22:45 +00:00
oembed_controller.rb	Fix OEmbed leaking information about existence of non-public statuses (#12930)	2020-01-24 00:20:51 +01:00