Claire 0b2c7cdb02 Merge commit 'fe2667bb0d3487a32b9da5250402a90482a85fe2' into glitch-soc/merge-upstream ...

Conflicts:
- `app/lib/content_security_policy.rb`:
  Conflict caused by glitch-soc's support for the extra `EXTRA_DATA_HOSTS`
  environment variable.
  Ported upstream's changes while keeping support for `EXTRA_DATA_HOSTS`.

2024-01-10 17:51:12 +01:00

..

disputes

Misc spec/refactor to user mailer and user mailer spec (#27486)

2023-10-27 09:57:16 +00:00

reports

Add confirmation screen when handling reports (#22375)

2023-01-18 16:40:09 +01:00

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

Fix Rails/ActionOrder cop (#24692)

2023-04-30 06:46:39 +02:00

base_controller.rb

Merge branch 'main' into glitch-soc/merge-upstream

2023-04-29 10:44:56 +02:00

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

Add ability to require approval when users sign up using specific email domains (#28468)

2024-01-04 09:07:05 +00:00

export_domain_allows_controller.rb

File cleanup/organization in controllers/concerns (#27846)

2023-11-30 14:39:41 +00:00

export_domain_blocks_controller.rb

Fix intermittent failure from unspecified order in export_domain_blocks controller spec (#28562)

2024-01-03 13:06:15 +00:00

follow_recommendations_controller.rb

Change algorithm of follow recommendations (#28314)

2023-12-19 10:59:43 +00:00

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

Fix Rails/ActionOrder cop (#24692)

2023-04-30 06:46:39 +02:00

rules_controller.rb

Fix Rails/ActionOrder cop (#24692)

2023-04-30 06:46:39 +02:00

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

Fix Rails/ActionOrder cop (#24692)

2023-04-30 06:46:39 +02:00

webhooks_controller.rb

Add finer permission requirements for managing webhooks (#25463)

2023-06-22 14:52:25 +02:00