Claire 02134172f1 Merge commit 'e770303968dc04d20dd5f3a5d7da3b9d7ba888fc' into glitch-soc/merge-upstream ...

Conflicts:
- `.rubocop_todo.yml`:
  Glitch-soc had different overrides, but upstream simply disabled the rules.
  Disabled them as well.
- `app/serializers/initial_state_serializer.rb`:
  Not really a conflict, again because of a rubocop comment.

2025-08-22 22:33:11 +02:00

..

activitypub

Merge commit '651e51a82eba542c4d8c3fec5edd16420ea1ff3e' into glitch-soc/merge-upstream

2025-08-17 20:52:34 +02:00

node_info

nodeinfo: add instance name and description (#28079)

2023-11-28 00:51:22 +00:00

rest

Merge commit '8d3bca3bb8c84e1e3735eb71bdce7acac3779bff' into glitch-soc/merge-upstream

2025-08-19 21:01: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 'e770303968dc04d20dd5f3a5d7da3b9d7ba888fc' into glitch-soc/merge-upstream

2025-08-22 22:33:11 +02:00

manifest_serializer.rb

Prefer native apps over PWA (#27254)

2024-10-07 20:33:14 +00:00

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