Claire aa832d623a Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `CHANGELOG.md`: Upstream added newlines. Conflicts are because the CHANGELOG was independently merged from 3.4.6 on last security update. Took upstream's version. - `app/helpers/context_helper.rb`: Conflicts because of extra vocabulary in glitch-soc. The conflicts were actually handled in last security merge. Kept our version.		2022-02-06 15:34:42 +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 notifications for statuses deleted by moderators (#17204)	2022-01-17 09:41:33 +01:00
action_logs_controller.rb	…
announcements_controller.rb	Change order of announcements in admin page to sort them newest-first (#15091)	2020-11-04 21:15:22 +01:00
base_controller.rb	…
change_emails_controller.rb	…
confirmations_controller.rb	…
custom_emojis_controller.rb	…
dashboard_controller.rb	Add trending links (#16917)	2021-11-25 13:07:38 +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	Add IP-based rules (#14963)	2020-10-12 16:33:49 +02:00
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	Add notifications for statuses deleted by moderators (#17204)	2022-01-17 09:41:33 +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	…