Glitch-Shrike/spec
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
..
controllers Merge branch 'main' into glitch-soc/merge-upstream 2021-12-16 16:20:44 +01:00
fabricators
features
fixtures
helpers
lib
mailers
models Merge branch 'main' into glitch-soc/merge-upstream 2021-12-16 16:20:44 +01:00
policies
presenters
requests
routing
serializers/activitypub
services
support
validators
views
workers
rails_helper.rb
spec_helper.rb