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_spec.rb

Remove collections feature flag (#39211)

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

add_spec.rb

Remove collections feature flag (#39211)

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

announce_spec.rb

Prefer to_json over JSON.generate when simple strings in stub request (#38258)

2026-03-17 16:10:54 +00:00

block_spec.rb

…

create_spec.rb

Merge commit '6a4d14b178fc00de989b4a2758f2a1e4adf5ed33' into glitch-soc/merge-upstream

2026-05-22 19:43:42 +02:00

delete_spec.rb

Remove collections feature flag (#39211)

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

feature_request_spec.rb

Remove collections feature flag (#39211)

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

flag_spec.rb

Add collections to Flag activities (#38817)

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

follow_spec.rb

…

like_spec.rb

…

move_spec.rb

…

quote_request_spec.rb

Prefer to_json over JSON.generate when simple strings in stub request (#38258)

2026-03-17 16:10:54 +00:00

reject_spec.rb

Remove rejected and revoked collection items (#38792)

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

remove_spec.rb

…

undo_spec.rb

…

update_spec.rb

Remove collections feature flag (#39211)

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