mastodon/spec/controllers
Claire 9a3d91f629 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `app/models/concerns/domain_materializable.rb`:
  Fixed a code style issue upstream in a PR that got merged in glitch-soc
  earlier.
  Changed the code to match upstream's.
2022-12-07 09:03:42 +01:00
..
activitypub
admin Log admin approve and reject account (#22088) 2022-12-07 00:25:18 +01:00
api Merge branch 'main' into glitch-soc/merge-upstream 2022-12-07 09:03:42 +01:00
auth
concerns
disputes Add customizable user roles (#18641) 2022-07-05 02:41:40 +02:00
oauth
settings
well_known
about_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
instance_actors_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
shares_controller_spec.rb
statuses_cleanup_controller_spec.rb
statuses_controller_spec.rb
tags_controller_spec.rb