Merge branch 'main' into glitch-soc/merge-upstream

Conflicts:
- `app/views/admin/pending_accounts/index.html.haml`:
  Removed upstream, while it had glitch-soc-specific changes to accomodate
  for glitch-soc's theming system.
  Removed the file.

Additional changes:
- `app/views/admin/accounts/index.html.haml':
  Accomodate for glitch-soc's theming system.

diff --cc app/controllers/concerns/two_factor_authentication_concern.rb
Simple merge

diff --cc app/javascript/mastodon/actions/compose.js
Simple merge

diff --cc app/javascript/packs/public.js
Simple merge

diff --cc app/models/account.rb
Simple merge

diff --cc app/views/admin/accounts/index.html.haml
Simple merge

diff --cc app/views/admin/dashboard/index.html.haml
Simple merge

diff --cc config/navigation.rb
Simple merge

diff --cc config/routes.rb
Simple merge

diff --cc db/schema.rb
Simple merge

diff --cc package.json
Simple merge

diff --cc yarn.lock
Simple merge