Claire b8209c3b96 Merge commit '85662a5a57531af5402a6777d0b1089e78c56815' into glitch-soc/merge-upstream ... Conflicts: - `config/initializers/content_security_policy.rb`: Upstream reworked the CSP, we kept our version for now. - `spec/requests/content_security_policy_spec.rb`: Upstream reworked the CSP, we kept our version for now.		2023-12-20 20:10:45 +01:00
..
appeals_controller.rb	Remove un-needed `action` and `template` options to `render` in controllers (#28022)	2023-11-29 10:38:05 +00:00
base_controller.rb	Merge branch 'main' into glitch-soc/merge-upstream	2023-04-29 10:44:56 +02:00
strikes_controller.rb	Change old moderation strikes to be displayed in a separate page (#17566)	2022-03-01 19:37:47 +01:00