Claire ae2ff31f32 Merge commit '0caf334891e0a5f4e995f1d667eb83d3aad7e41e' into glitch-soc/merge-upstream ...

Conflicts:
- `lib/mastodon/version.rb`:
  Upstream updated the API version, while we also have a custom glitch API version.
  Updated as upstream did.

2026-05-30 12:13:35 +02:00

..

activitypub

Merge commit '0caf334891e0a5f4e995f1d667eb83d3aad7e41e' into glitch-soc/merge-upstream

2026-05-30 12:13:35 +02:00

concerns

Add fallback attributes to notifications for new and infrequent notifications (#38832)

2026-04-29 15:53:29 +00:00

node_info

…

rest

Merge commit '0caf334891e0a5f4e995f1d667eb83d3aad7e41e' into glitch-soc/merge-upstream

2026-05-30 12:13:35 +02:00

seo

Simplify media attachment lookup in show/player actions (#38565)

2026-04-07 09:58:37 +00: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 '562ea656f495f0619e393b7d93bd07c5abd28e5a' into glitch-soc/merge-upstream

2026-01-21 22:04:02 +01: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

Add support for FEP-3b86 (Activity Intents) (#38120)

2026-03-10 10:21:24 +00:00