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 Refactor ActivityPub handling to prepare for non-Account actors (#19212) 2022-09-21 22:45:57 +02:00
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 Fix suspicious sign-in mails never being sent (#18599) 2022-06-21 15:16:22 +02:00
concerns Refactor ActivityPub handling to prepare for non-Account actors (#19212) 2022-09-21 22:45:57 +02:00
disputes Add customizable user roles (#18641) 2022-07-05 02:41:40 +02:00
oauth
settings Merge branch 'main' into glitch-soc/merge-upstream 2022-10-28 19:23:58 +02:00
well_known
about_controller_spec.rb Change about page to be mounted in the web UI (#19345) 2022-10-13 14:42:37 +02:00
accounts_controller_spec.rb Change public accounts pages to mount the web UI (#19319) 2022-10-20 14:35:29 +02:00
application_controller_spec.rb Merge branch 'main' into glitch-soc/merge-upstream 2022-07-05 09:33:44 +02:00
authorize_interactions_controller_spec.rb Change public accounts pages to mount the web UI (#19319) 2022-10-20 14:35:29 +02:00
emojis_controller_spec.rb
follower_accounts_controller_spec.rb Change public accounts pages to mount the web UI (#19319) 2022-10-20 14:35:29 +02:00
following_accounts_controller_spec.rb Change public accounts pages to mount the web UI (#19319) 2022-10-20 14:35:29 +02:00
health_controller_spec.rb
home_controller_spec.rb Revert Home controller test to upstream 2022-10-28 20:12:04 +02:00
instance_actors_controller_spec.rb
intents_controller_spec.rb
invites_controller_spec.rb Add customizable user roles (#18641) 2022-07-05 02:41:40 +02:00
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 Refactor ActivityPub handling to prepare for non-Account actors (#19212) 2022-09-21 22:45:57 +02:00
tags_controller_spec.rb Change public accounts pages to mount the web UI (#19319) 2022-10-20 14:35:29 +02:00