mastodon/spec/controllers/api/v1/accounts
Claire b474cbbd28 Merge commit '7840c6b75b61e64d89d7fd9f291277fb177e513f' into glitch-soc/merge-upstream
Conflicts:
- `app/controllers/api/v1/accounts/relationships_controller.rb`:
  We differed by listing suspended users when requesting relationships.
  Updated to upstream's code.
2023-12-18 18:40:58 +01:00
..
credentials_controller_spec.rb Merge commit 'c91c0175db1cc8b954a977d29472886234ce9586' into glitch-soc/merge-upstream 2023-10-17 21:35:07 +02:00
familiar_followers_controller_spec.rb
follower_accounts_controller_spec.rb
following_accounts_controller_spec.rb
identity_proofs_controller_spec.rb
lists_controller_spec.rb
lookup_controller_spec.rb
notes_controller_spec.rb
pins_controller_spec.rb
search_controller_spec.rb
statuses_controller_spec.rb