You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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.		11 months ago
..
appeals_controller.rb	Remove un-needed `action` and `template` options to `render` in controllers (#28022)	12 months ago
base_controller.rb	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
strikes_controller.rb	Change old moderation strikes to be displayed in a separate page (#17566)	3 years ago