Claire 11902d958f Merge commit 'ce1680e6f979889ebd5c775353f3b82a8b2698bb' into glitch-soc/merge-upstream ...

Conflicts:
- `app/models/concerns/user/has_settings.rb`:
  Upstream added a new helper for a setting, where glitch-soc had extra ones.
  Not a real conflict, added upstream's new helper without removing glitch-soc's ones.

2025-08-09 23:02:43 +02:00

..

activitypub

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

2025-08-07 18:16:54 +02:00

node_info

…

rest

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

2025-08-05 15:46:33 +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 'ce1680e6f979889ebd5c775353f3b82a8b2698bb' into glitch-soc/merge-upstream

2025-08-09 23:02:43 +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