Claire b2526316f5 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.

2021-12-16 16:20:44 +01:00

..

activitypub

…

admin

…

api

…

auth

…

concerns

…

oauth

…

settings

…

well_known

…

about_controller_spec.rb

…

account_follow_controller_spec.rb

…

account_unfollow_controller_spec.rb

…

accounts_controller_spec.rb

…

application_controller_spec.rb

…

authorize_interactions_controller_spec.rb

…

emojis_controller_spec.rb

…

follower_accounts_controller_spec.rb

…

following_accounts_controller_spec.rb

…

health_controller_spec.rb

…

home_controller_spec.rb

…

intents_controller_spec.rb

…

invites_controller_spec.rb

…

manifests_controller_spec.rb

…

media_controller_spec.rb

…

media_proxy_controller_spec.rb

…

relationships_controller_spec.rb

…

remote_follow_controller_spec.rb

…

remote_interaction_controller_spec.rb

…

shares_controller_spec.rb

…

statuses_cleanup_controller_spec.rb

…

statuses_controller_spec.rb

…

tags_controller_spec.rb

…