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 Remove Keybase integration (#17045) 2021-11-26 05:58:18 +01:00
features
fixtures
helpers Merge branch 'main' into glitch-soc/merge-upstream 2021-11-25 23:50:35 +01:00
lib Merge branch 'main' into glitch-soc/merge-upstream 2021-11-26 22:53:55 +01:00
mailers Add trending links (#16917) 2021-11-25 13:07:38 +01:00
models Merge branch 'main' into glitch-soc/merge-upstream 2021-12-16 16:20:44 +01:00
policies
presenters
requests
routing
serializers/activitypub
services Merge branch 'main' into glitch-soc/merge-upstream 2021-11-26 22:53:55 +01:00
support
validators
views
workers Fix AccountNote not having a maximum length (#16942) 2021-11-06 00:12:25 +01:00
rails_helper.rb
spec_helper.rb