Claire 0e1ea3110e Merge commit '7f16397f3c37a8e378239974b73afbfe2b6e6844' into glitch-soc/merge-upstream ...

Conflicts:
- `lib/mastodon/version.rb`:
  Upstream bumped the mastodon API version, glitch-soc has a change on an adjacent
  line adding a glitch API version.

2026-02-27 21:25:37 +01: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

Add "featured collections" collection to actors (#37512)

2026-01-20 08:27:05 +00:00

followers_synchronizations_controller.rb

…

inboxes_controller.rb

Merge commit from fork

2026-01-20 15:14:45 +01: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