mastodon/app/lib/activitypub/activity
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 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 Fix duplicate notifications being possible after poll expiration (#17697) 2022-03-04 01:06:33 +01:00
like.rb Fix duplicate notifications being possible after poll expiration (#17697) 2022-03-04 01:06:33 +01:00
move.rb
reject.rb
remove.rb
undo.rb
update.rb Fix searching already-known converted activities by URL (#17814) 2022-03-17 00:46:49 +01:00