Claire 9a3d91f629 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/models/concerns/domain_materializable.rb`: Fixed a code style issue upstream in a PR that got merged in glitch-soc earlier. Changed the code to match upstream's.		2022-12-07 09:03:42 +01:00
..
disputes
reports
settings
trends
users
webhooks
account_actions_controller.rb
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
base_controller.rb	Merge branch 'main' into glitch-soc/merge-upstream	2022-07-05 09:33:44 +02:00
change_emails_controller.rb
confirmations_controller.rb
custom_emojis_controller.rb
dashboard_controller.rb
domain_allows_controller.rb
domain_blocks_controller.rb
email_domain_blocks_controller.rb
export_domain_allows_controller.rb
export_domain_blocks_controller.rb	Fix various issues with domain block import (#1944)	2022-11-17 11:42:20 +01:00
follow_recommendations_controller.rb	Add customizable user roles (#18641)	2022-07-05 02:41:40 +02:00
instances_controller.rb
invites_controller.rb
ip_blocks_controller.rb
relationships_controller.rb
relays_controller.rb	Fix relays UI being available in whitelist/secure mode (#11963)	2019-09-27 02:13:34 +02:00
report_notes_controller.rb	Add notifications for statuses deleted by moderators (#17204)	2022-01-17 09:41:33 +01:00
reports_controller.rb
resets_controller.rb
roles_controller.rb
rules_controller.rb	Add server rules (#15769)	2021-02-21 19:50:12 +01:00
settings_controller.rb
site_uploads_controller.rb
statuses_controller.rb	Add ability to view previous edits of a status in admin UI (#19462)	2022-10-26 13:42:29 +02:00
tags_controller.rb
warning_presets_controller.rb
webhooks_controller.rb