Claire 694c073d1f Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/admin/dashboard_controller.rb`: Upstream completely redesigned the admin dashboard. glitch-soc tracked extra features, but that list is gone. Followed upstram. - `app/views/admin/dashboard/index.html.haml` Upstream completely redesigned the admin dashboard. glitch-soc tracked extra features, but that list is gone. Followed upstram.		2021-10-14 21:44:57 +02:00
..
account_actions
account_moderation_notes
account_warnings
accounts	Add ability to skip sign-in token authentication for specific users (#16427)	2021-07-08 05:31:28 +02:00
action_logs	Merge branch 'main' into glitch-soc/merge-upstream	2021-03-24 10:53:50 +01:00
announcements
change_emails
custom_emojis
dashboard	Merge branch 'main' into glitch-soc/merge-upstream	2021-10-14 21:44:57 +02:00
domain_allows
domain_blocks
email_domain_blocks
follow_recommendations	Merge branch 'main' into glitch-soc/merge-upstream	2021-07-08 16:17:19 +02:00
instances	Change number_to_human calls to always use 3-digits precision (#16469)	2021-07-07 21:13:08 +02:00
invites
ip_blocks
pending_accounts
relationships
relays
report_notes
reports	Merge branch 'main' into glitch-soc/merge-upstream	2021-07-11 21:41:23 +02:00
rules	Fix missing source strings and inconsistent lead text style in admin UI (#16052)	2021-04-17 11:12:49 +02:00
settings	Merge branch 'main' into glitch-soc/merge-upstream	2021-05-07 18:21:59 +02:00
statuses
tags	Merge branch 'main' into glitch-soc/merge-upstream	2021-07-08 16:17:19 +02:00
warning_presets