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	Add ability to view previous edits of a status in admin UI (#19462)	2022-10-26 13:42:29 +02:00
users	Add audit log entries for user roles (#19040)	2022-08-25 20:39:40 +02:00
webhooks	…
account_actions_controller.rb	…
account_moderation_notes_controller.rb	…
accounts_controller.rb	…
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	…
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	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	Refactor: replace whitelist_mode mentions with limited_federation_mode (#26252)	2023-08-02 19:32:48 +02:00
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	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	…
statuses_controller.rb	…
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