Claire 6530f9709c Merge commit '121443c0fca383268b8022c048dd137994785aff' into glitch-soc/main ...

Conflicts:
- `.rubocop_todo.yml`:
  Upstream regenerated this file, glitch-soc had a specific ignore.

2023-08-13 18:47:15 +02:00

..

disputes

…

reports

…

settings

…

trends

…

users

…

webhooks

…

account_actions_controller.rb

…

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

Fix blocking subdomains of an already-blocked domain (#26392)

2023-08-09 09:39:36 +02: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

…

statuses_controller.rb

…

tags_controller.rb

…

warning_presets_controller.rb

…

webhooks_controller.rb

…