Claire 30ee7339d3 Merge commit '7d9b209fe8' into glitch-soc/merge-upstream ... Conflicts: - `app/models/form/admin_settings.rb`: Upstream changed code style change, including on a line modified by glitch-soc. Kept glitch-soc's line but with the code style change applied.		2023-12-21 19:31:12 +01:00
..
v1	Merge commit '7d9b209fe8' into glitch-soc/merge-upstream	2023-12-21 19:31:12 +01:00
v2	Merge commit '0530ce5e95' into glitch-soc/merge-upstream	2023-12-20 21:58:18 +01:00
web	Improve spec coverage for api/web/push_subscriptions controller (#27858)	2023-11-15 13:14:51 +00:00
base_controller.rb	Fix Style/RedundantParentheses cop (#28176)	2023-12-01 16:00:44 +00:00
oembed_controller.rb	Fix OEmbed leaking information about existence of non-public statuses (#12930)	2020-01-24 00:20:51 +01:00