Claire 077e0c6812 Merge commit '0b4a3a04378ce43f2f314b9446b5053f6b374c6d' into glitch-soc/merge-upstream ... Conflicts: - `Gemfile.lock`: Conflict caused by the `json` gem thing once again. Updated as upstream did, but keeping the most recent `json` version. - `spec/helpers/application_helper_spec.rb`: Upstream refactored a bunch of specs, including one place that differs because of glitch-soc's theming system. Refactored as upstream did, adapting it for glitch-soc's theming system.		2023-12-20 22:16:50 +01:00
..
v1	Merge commit '0b4a3a04378ce43f2f314b9446b5053f6b374c6d' into glitch-soc/merge-upstream	2023-12-20 22:16:50 +01:00
v2	Merge commit '0530ce5e9575c09464847412f43852f438b0494e' 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