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

..

activitypub

Merge commit 'e93efe0e131481635e88d7ad114ef66148626f90' into glitch-soc/merge-upstream

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

node_info

…

rest

Merge commit 'e93efe0e131481635e88d7ad114ef66148626f90' into glitch-soc/merge-upstream

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

web

Make Web::PushSubscription#user and Web::PushSubscription#access_token relationships non-optional (#34498)

2025-04-23 08:12:31 +00:00

initial_state_serializer.rb

Merge commit '7d3ef27a8dc8fb281bae959b245d3db63aa82260' into glitch-soc/merge-upstream

2025-07-23 18:43:56 +02:00

manifest_serializer.rb

…

oauth_metadata_serializer.rb

Update OAuth inflection to match spec (#35160)

2025-06-25 07:52:30 +00:00

oauth_userinfo_serializer.rb

Update OAuth inflection to match spec (#35160)

2025-06-25 07:52:30 +00:00

oembed_serializer.rb

Reduce path size for oEmbed and logo (#34538)

2025-04-24 11:38:02 +00:00

webfinger_serializer.rb

Move "limited federation mode" config to x.mastodon area (#35041)

2025-06-16 06:13:03 +00:00