mastodon/spec/controllers/api/v1/accounts
Claire b8209c3b96 Merge commit '85662a5a57531af5402a6777d0b1089e78c56815' into glitch-soc/merge-upstream
Conflicts:
- `config/initializers/content_security_policy.rb`:
  Upstream reworked the CSP, we kept our version for now.
- `spec/requests/content_security_policy_spec.rb`:
  Upstream reworked the CSP, we kept our version for now.
2023-12-20 20:10:45 +01:00
..
credentials_controller_spec.rb
familiar_followers_controller_spec.rb Fix FamiliarFollowersController test response comparison (#28121) 2023-11-30 10:58:40 +00:00
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