This repository has been archived on 2024-07-22. You can view files and clone it, but cannot push or open issues or pull requests.
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.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
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
follow.rb
like.rb
move.rb
reject.rb
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