Claire f224237862 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `db/schema.rb`: Conflict due to glitch-soc adding the `content_type` column on status edits and thus having a different schema version number. Solved by taking upstream's schema version number, as it is higher than glitch-soc's.		2022-02-17 10:58:44 +01:00
..
disputes	Add appeals (#17364)	2022-02-14 21:27:53 +01:00
reports	Change actions in reports to require only one click (#17487)	2022-02-11 21:51:57 +01:00
trends	Add trending links (#16917)	2021-11-25 13:07:38 +01:00
account_actions_controller.rb
account_moderation_notes_controller.rb	Add notifications for statuses deleted by moderators (#17204)	2022-01-17 09:41:33 +01:00
accounts_controller.rb	Add appeals (#17364)	2022-02-14 21:27:53 +01:00
action_logs_controller.rb
announcements_controller.rb
base_controller.rb
change_emails_controller.rb
confirmations_controller.rb
custom_emojis_controller.rb
dashboard_controller.rb	Add appeals (#17364)	2022-02-14 21:27:53 +01:00
domain_allows_controller.rb
domain_blocks_controller.rb	Further preparation for Rails 6 (#15916)	2021-03-19 02:45:34 +01:00
email_domain_blocks_controller.rb
follow_recommendations_controller.rb	Add cold-start follow recommendations (#15945)	2021-04-12 12:37:14 +02:00
instances_controller.rb	Add ability to purge undeliverable domains from admin interface (#16686)	2021-12-17 23:01:21 +01:00
invites_controller.rb
ip_blocks_controller.rb
relationships_controller.rb	Fix error on account relationships page in admin UI (#17444)	2022-02-05 05:06:34 +01:00
relays_controller.rb
report_notes_controller.rb	Add notifications for statuses deleted by moderators (#17204)	2022-01-17 09:41:33 +01:00
reports_controller.rb	Add notifications for statuses deleted by moderators (#17204)	2022-01-17 09:41:33 +01:00
resets_controller.rb	Add ability to skip sign-in token authentication for specific users (#16427)	2021-07-08 05:31:28 +02:00
roles_controller.rb
rules_controller.rb	Add server rules (#15769)	2021-02-21 19:50:12 +01:00
settings_controller.rb
sign_in_token_authentications_controller.rb	Add ability to skip sign-in token authentication for specific users (#16427)	2021-07-08 05:31:28 +02:00
site_uploads_controller.rb
statuses_controller.rb	Fix empty batch statuses selection causing a 500 error (#17532)	2022-02-12 19:52:17 +01:00
subscriptions_controller.rb
tags_controller.rb	Add trending links (#16917)	2021-11-25 13:07:38 +01:00
two_factor_authentications_controller.rb	Add ability to skip sign-in token authentication for specific users (#16427)	2021-07-08 05:31:28 +02:00
warning_presets_controller.rb