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.		2022-05-16 09:42:32 +02:00
..
accept.rb
add.rb
announce.rb	Fix Mastodon::RaceConditionError that occurs when external status is reblogged (#18424)	2022-05-16 01:00:09 +02:00
block.rb
create.rb	Merge branch 'main' into glitch-soc/merge-upstream	2022-05-16 09:42:32 +02:00
delete.rb	Refactor how Redis locks are created (#18400)	2022-05-13 00:02:35 +02:00
flag.rb
follow.rb
like.rb
move.rb
reject.rb
remove.rb
undo.rb
update.rb