mastodon/app/lib/activitypub/activity
Claire 85558a5e18 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `README.md`:
  Minor upstream change, our README is completely different.
  Kept ours.
- `lib/tasks/assets.rake`:
  glitch-soc has extra code to deal with its theming system,
  upstream changed a line that exists in glitch-soc.
  Applied upstream changes.
2023-02-09 12:46:12 +01:00
..
accept.rb Add support for private pinned posts (#16954) 2022-01-17 00:49:55 +01:00
add.rb Add featured tag add/remove activity handler (#19408) 2022-10-22 11:49:41 +02:00
announce.rb Fix Mastodon::RaceConditionError that occurs when external status is reblogged (#18424) 2022-05-16 01:00:09 +02:00
block.rb Fix processing of incoming Block activities (#15546) 2021-01-12 09:25:01 +01:00
create.rb Merge branch 'main' into glitch-soc/merge-upstream 2023-02-09 12:46:12 +01: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 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 Fix race conditions on account migration creation (#15597) 2021-02-02 14:49:57 +01:00
reject.rb Fix handling of Reject Follow when a matching follow relationship exists (#14479) 2020-08-01 18:20:37 +02:00
remove.rb Add featured tag add/remove activity handler (#19408) 2022-10-22 11:49:41 +02:00
undo.rb
update.rb Fix unbounded recursion in account discovery (#22025) 2022-12-07 00:15:24 +01:00