Claire 1474318691 Merge commit 'a916251d8a8fffcaeb6be80eacf50138a53650dc' into glitch-soc/main ... Conflicts: - `app/models/trends/statuses.rb`: Upstream fixed a bug in the trending post condition. Glitch-soc's condition is different because we potentially allow CWed content to trend. Ported upstream's fix while keeping glitch-soc's change. - `config/initializers/content_security_policy.rb`: Kept our version for now, we will switch to upstream later down the road.		2023-12-17 15:32:29 +01:00
..
disputes	Misc spec/refactor to user mailer and user mailer spec (#27486)	2023-10-27 09:57:16 +00:00
reports	…
settings	…
trends	…
users	…
webhooks	…
account_actions_controller.rb	Fix report processing notice not mentioning the report number when performing a custom action (#27442)	2023-10-26 17:03:31 +00:00
account_moderation_notes_controller.rb	…
accounts_controller.rb	…
action_logs_controller.rb	…
announcements_controller.rb	…
base_controller.rb	…
change_emails_controller.rb	…
confirmations_controller.rb	…
custom_emojis_controller.rb	…
dashboard_controller.rb	…
domain_allows_controller.rb	…
domain_blocks_controller.rb	Add some more tests and clean up domain block controller (#27469)	2023-10-31 09:40:30 +00:00
email_domain_blocks_controller.rb	…
export_domain_allows_controller.rb	…
export_domain_blocks_controller.rb	…
follow_recommendations_controller.rb	…
instances_controller.rb	…
invites_controller.rb	…
ip_blocks_controller.rb	…
relationships_controller.rb	…
relays_controller.rb	…
report_notes_controller.rb	…
reports_controller.rb	…
resets_controller.rb	…
roles_controller.rb	…
rules_controller.rb	…
settings_controller.rb	…
site_uploads_controller.rb	…
software_updates_controller.rb	…
statuses_controller.rb	…
tags_controller.rb	…
warning_presets_controller.rb	…
webhooks_controller.rb	…