mastodon/app/lib/activitypub/activity
Claire e4f8679eae Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- `app/models/form/admin_settings.rb`:
  New setting added upstream. Ported it.
- `app/views/statuses/_simple_status.html.haml`:
  Upstream removed RTL classes. Did the same.
- `config/settings.yml`:
  New setting added upstream. Ported it.
2020-12-15 14:27:06 +01:00
..
accept.rb Allow Accept/Reject with a non-embedded object (#12199) 2019-10-24 22:45:43 +02:00
add.rb Resolve unknown status from Add activity, skip Remove if unknown (#7526) 2018-05-18 11:33:56 +02:00
announce.rb Add support for inlined objects in activity audience (#14514) 2020-08-24 14:11:47 +02:00
block.rb Fix not handling Undo on some activity types when they aren't inlined (#14346) 2020-07-22 11:45:35 +02:00
create.rb Merge branch 'master' into glitch-soc/merge-upstream 2020-12-15 14:27:06 +01:00
delete.rb Fix sending spurious Rejects when processing remote account deletion (#15104) 2020-11-19 17:39:47 +01:00
flag.rb Change domain blocks to automatically support subdomains (#11138) 2019-06-22 00:13:10 +02:00
follow.rb Add option to be notified when a followed user posts (#13546) 2020-09-18 17:26:45 +02:00
like.rb Add option to be notified when a followed user posts (#13546) 2020-09-18 17:26:45 +02:00
move.rb Fix Move handler not being triggered when failing to fetch target (#15107) 2020-11-09 01:41:52 +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 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 Dereference object URIs in Create and Update messages (#14359) 2020-07-22 11:43:17 +02:00