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 support for private pinned posts (#16954)	2022-01-17 00:49:55 +01:00
add.rb	Add support for private pinned posts (#16954)	2022-01-17 00:49:55 +01:00
announce.rb
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	Fix reports of already suspended accounts being recorded (#16047)	2021-04-16 22:01:05 +02:00
follow.rb
like.rb
move.rb
reject.rb
remove.rb	Resolve unknown status from Add activity, skip Remove if unknown (#7526)	2018-05-18 11:33:56 +02:00
undo.rb	Fix not handling Undo on some activity types when they aren't inlined (#14346)	2020-07-22 11:45:35 +02:00
update.rb