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

..

base_controller.rb

…

collections_controller.rb

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

2026-02-03 15:44:04 +01:00

contexts_controller.rb

Fix serialization of context pages (#37376)

2026-01-05 11:59:10 +00:00

feature_authorizations_controller.rb

Issue FeatureAuthorizations (#38004)

2026-02-27 11:00:21 +00:00

featured_collections_controller.rb

Remove collections feature flag (#39211)

2026-05-29 09:37:42 +00:00

followers_synchronizations_controller.rb

…

inboxes_controller.rb

Use JSON.parse in AP inboxes (#38238)

2026-03-16 16:58:13 +00:00

likes_controller.rb

Merge commit from fork

2025-12-08 15:44:08 +01:00

outboxes_controller.rb

Add support for numeric-based URIs for local accounts (#32724)

2025-09-29 12:05:48 +00:00

quote_authorizations_controller.rb

Merge commit from fork

2025-12-08 15:44:08 +01:00

replies_controller.rb

Merge commit from fork

2025-12-08 15:44:08 +01:00

shares_controller.rb

Merge commit from fork

2025-12-08 15:44:08 +01:00