Claire b3bae7e78f Merge commit '3473b8a65278783bc74ce2738aea98cca0c7a5ed' into glitch-soc/merge-upstream ...

Conflicts:
- `config/settings.yml`:
  Upstream added a new setting textually adjacent to ones modified by glitch-soc's.
  Added upstream's new setting.

2026-04-25 09:20:39 +02:00

..

activitypub

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

2026-04-17 18:06:10 +02:00

node_info

…

rest

Merge commit '3473b8a65278783bc74ce2738aea98cca0c7a5ed' into glitch-soc/merge-upstream

2026-04-25 09:20:39 +02:00

seo

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

2026-04-07 09:58:37 +00:00

web

…

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

…

webfinger_serializer.rb

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

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