Claire 443ec4f8ba Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/views/admin/tags/index.html.haml`: Removed upstream while it had changes in glitch-soc to accomodate for the theming system. Additional changes to accomodate for the theming system: - `app/views/admin/trends/links/preview_card_providers/index.html.haml` - `app/views/admin/trends/links/index.html.haml` - `app/views/admin/trends/tags/index.html.haml` - `app/views/admin/tags/show.html.haml`		2021-11-25 23:50:35 +01:00
..
trends	Add trending links (#16917)	2021-11-25 13:07:38 +01:00
account_actions_controller.rb	…
account_moderation_notes_controller.rb	…
accounts_controller.rb	Add account sensitized (#14361)	2020-11-04 20:45:01 +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 management of delivery availability in Federation settings (#15771)	2021-05-05 23:39:02 +02:00
invites_controller.rb	…
ip_blocks_controller.rb	…
pending_accounts_controller.rb	…
relationships_controller.rb	…
relays_controller.rb	…
report_notes_controller.rb	…
reported_statuses_controller.rb	…
reports_controller.rb	…
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 statuses order in account's statuses admin page (#16937)	2021-11-04 15:49:35 +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	…