Claire 46ddaffd40 Merge commit 'b87bfb8c96c8491f1228e0258d05119f3420db05' into glitch-soc/merge-upstream

2023-12-18 18:34:25 +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

Add back missing glitch-soc admin settings (#1919)

2022-11-12 13:24:53 +01:00

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

Log admin approve and reject account (#22088)

2022-12-07 00:25:18 +01:00

action_logs_controller.rb

…

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

Fix inaccurate admin log entry for re-sending confirmation e-mails (#19674)

2022-11-02 18:50:21 +01:00

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

Remove references to non-existent actions (#24183)

2023-03-20 20:03:44 +01:00

export_domain_allows_controller.rb

Change domain block CSV parsing to be more robust and handle more lists (#21470)

2023-01-18 16:20:52 +01:00

export_domain_blocks_controller.rb

Change domain block CSV parsing to be more robust and handle more lists (#21470)

2023-01-18 16:20:52 +01:00

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

Allow adding relays while secure mode & limited federation mode are enabled (#22324)

2022-12-15 15:56:05 +01:00

report_notes_controller.rb

…

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

Use helper method to build batched status edits in admin/statuses/show (#27739)

2023-11-08 13:04:52 +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