You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Claire 040b7d37a4 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/services/remove_status_service.rb`: Conflict due to glitch-soc having extra code for a proper direct visibility timeline, in a part of the code upstream refactored. Restored glitch-soc's extra code in the refactored bit.		3 years ago
..
accept.rb	Add support for private pinned posts (#16954)	3 years ago
add.rb	Add support for private pinned posts (#16954)	3 years ago
announce.rb	Fix `Mastodon::RaceConditionError` that occurs when external status is reblogged (#18424)	3 years ago
block.rb	Fix processing of incoming Block activities (#15546)	4 years ago
create.rb	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
delete.rb	Refactor how Redis locks are created (#18400)	3 years ago
flag.rb	Fix reports of already suspended accounts being recorded (#16047)	4 years ago
follow.rb	Fix duplicate notifications being possible after poll expiration (#17697)	3 years ago
like.rb	Fix duplicate notifications being possible after poll expiration (#17697)	3 years ago
move.rb	Fix race conditions on account migration creation (#15597)	4 years ago
reject.rb	Fix handling of Reject Follow when a matching follow relationship exists (#14479)	4 years ago
remove.rb	Resolve unknown status from Add activity, skip Remove if unknown (#7526)	7 years ago
undo.rb	Fix not handling Undo on some activity types when they aren't inlined (#14346)	4 years ago
update.rb	Fix searching already-known converted activities by URL (#17814)	3 years ago