Claire 73f77c49d8 Merge commit '16c41e035bdd6e08927c950aeeb5332adbe8b6d5' into glitch-soc/merge-upstream ...

Conflicts:
- `lib/mastodon/version.rb`:
  Upstream bumped the Mastodon API version, glitch-soc has an extra glitch version.
  Bumped the Mastodon API version as upstream did.

2026-03-16 18:16:56 +01:00

..

accept.rb

Fix potential duplicate handling of quote accept/reject/delete (#37537)

2026-01-19 13:47:27 +00:00

add.rb

Handle Add activity to featuredCollections (#38167)

2026-03-12 10:14:22 +00:00

announce.rb

…

block.rb

…

create.rb

Merge commit '89c1b9a8fdfe38881ad1b6c22f20240b087aa993' into glitch-soc/merge-upstream

2026-01-26 18:09:54 +01:00

delete.rb

Fix potential duplicate handling of quote accept/reject/delete (#37537)

2026-01-19 13:47:27 +00:00

feature_request.rb

Start of handling FeatureRequest activities (#38193)

2026-03-16 09:04:28 +00:00

flag.rb

…

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

Add experimental basic quote post authoring (#35355)

2025-07-25 12:35:24 +00:00

remove.rb

Handle Remove of an individual collection item (#38170)

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

undo.rb

…

update.rb

Merge commit from fork

2026-01-20 15:13:43 +01:00