mastodon/app/controllers/admin
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
..
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 Remove un-needed `action` and `template` options to `render` in controllers (#28022) 2023-11-29 10:38:05 +00:00
accounts_controller.rb
action_logs_controller.rb Remove `default_scope` from `Admin::ActionLog` (#28026) 2023-11-29 10:39:59 +00:00
announcements_controller.rb
base_controller.rb
change_emails_controller.rb
confirmations_controller.rb
custom_emojis_controller.rb
dashboard_controller.rb Remove unused `redis_info` method Admin::Dashboard (#25345) 2023-06-09 14:03:35 +02:00
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 Add support for displaying unknown servers on /admin/instances/:domain (#27150) 2023-10-23 14:27:57 +02:00
invites_controller.rb
ip_blocks_controller.rb
relationships_controller.rb
relays_controller.rb Remove un-needed `action` and `template` options to `render` in controllers (#28022) 2023-11-29 10:38:05 +00:00
report_notes_controller.rb Remove un-needed `action` and `template` options to `render` in controllers (#28022) 2023-11-29 10:38:05 +00:00
reports_controller.rb
resets_controller.rb
roles_controller.rb
rules_controller.rb
settings_controller.rb
site_uploads_controller.rb
software_updates_controller.rb Add admin notifications for new Mastodon versions (#26582) 2023-09-01 17:47:07 +02:00
statuses_controller.rb Remove `default_scope` from `StatusEdit` class (#28042) 2023-11-23 09:26:11 +00:00
tags_controller.rb
warning_presets_controller.rb
webhooks_controller.rb Add finer permission requirements for managing webhooks (#25463) 2023-06-22 14:52:25 +02:00