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

..

accept.rb

Remove collections feature flag (#39211)

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

add.rb

Remove collections feature flag (#39211)

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

announce.rb

Reject announce payload if object is nil (#33570)

2025-01-13 13:35:16 +00:00

block.rb

…

create.rb

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

2026-05-05 18:01:14 +02:00

delete.rb

Remove collections feature flag (#39211)

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

feature_request.rb

Remove collections feature flag (#39211)

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

flag.rb

Add collections to Flag activities (#38817)

2026-04-28 11:09:43 +00:00

follow.rb

Use to_json call for AP::Follow reject path (#38227)

2026-03-16 14:40:51 +00:00

like.rb

…

move.rb

…

quote_request.rb

Use to_json call for AP::QuoteRequest accept/reject paths (#38229)

2026-03-16 14:49:09 +00:00

reject.rb

Remove rejected and revoked collection items (#38792)

2026-04-28 11:10:25 +00:00

remove.rb

Handle Remove of an individual collection item (#38170)

2026-03-12 11:11:39 +00:00

undo.rb

…

update.rb

Remove collections feature flag (#39211)

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