mastodon/app/lib/activitypub/activity
Claire 8ec4be4233 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `Gemfile.lock`:
  Not a real conflict, upstream-updated dependency (redis) textually too
  close to glitch-soc-only dependecy.
  Updated redis gem like upstream did.
2021-08-09 23:25:49 +02:00
..
accept.rb
add.rb
announce.rb Change trending hashtags to be affected be reblogs (#16164) 2021-05-07 14:33:43 +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 2021-08-09 23:25:49 +02:00
delete.rb Fix processing of remote Delete activities (#16084) 2021-04-21 04:46:09 +02:00
flag.rb Fix reports of already suspended accounts being recorded (#16047) 2021-04-16 22:01:05 +02:00
follow.rb Fix URI of repeat follow requests not being recorded (#15662) 2021-02-11 01:53:44 +01:00
like.rb
move.rb Fix race conditions on account migration creation (#15597) 2021-02-02 14:49:57 +01:00
reject.rb
remove.rb
undo.rb
update.rb