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

..

fasp

Reject unconfirmed FASPs (#37926)

2026-02-20 14:40:31 +00:00

v1

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

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

v1_alpha

Move Collections API to v1 namespace (#39210)

2026-05-29 08:39:51 +00:00

v2

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

2026-04-30 19:00:48 +02:00

web

Merge commit from fork

2026-01-20 15:10:38 +01:00

base_controller.rb

Move "limited federation mode" config to x.mastodon area (#35041)

2025-06-16 06:13:03 +00:00

oembed_controller.rb

Move default embed size knowledge into OEmbedSerializer (#31990)

2024-09-20 12:39:48 +00:00