Claire 8649681c51 Merge commit 'e93efe0e131481635e88d7ad114ef66148626f90' into glitch-soc/merge-upstream ...

Conflicts:
- `app/serializers/activitypub/note_serializer.rb`:
  Conflict because upstream added context extensions where glitch-soc had its own.
  Added upstream's new context extension while keeping ours.

2025-07-25 21:45:00 +02:00

..

admin

…

api

…

auth

…

concerns

…

oauth

…

settings

…

application_controller_spec.rb

…

authorize_interactions_controller_spec.rb

…

follower_accounts_controller_spec.rb

…

following_accounts_controller_spec.rb

…

relationships_controller_spec.rb

…