mastodon/app/lib/activitypub
Thibaut Girka 48f0f3ffee Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- `.github/ISSUE_TEMPLATE/bug_report.md`:
  Upstream added the `bug` label to bug reports.
  Did the same.
- `app/services/fan_out_on_write_service.rb`:
  Upstream put DMs back into timelines, glitch-soc was already doing it.
  Ignored upstream changes.
2020-11-20 13:27:48 +01:00
..
activity Merge branch 'master' into glitch-soc/merge-upstream 2020-11-20 13:27:48 +01:00
activity.rb Fix a bear check when the activity object is nil (#14981) 2020-10-13 22:41:00 +02:00
adapter.rb Merge branch 'master' into glitch-soc/merge-upstream 2020-11-08 14:20:35 +01:00
case_transform.rb Add serializing/unserializing of "locked" actor attribute (#4585) 2017-08-12 17:41:03 +02:00
dereferencer.rb Add support for dereferencing objects through bearcaps (#14683) 2020-08-30 12:34:20 +02:00
linked_data_signature.rb Bump rubocop from 0.86.0 to 0.88.0 (#14412) 2020-09-01 03:04:00 +02:00
serializer.rb Fix ActivityPub context not being dynamically computed (#11746) 2019-09-03 22:52:32 +02:00
tag_manager.rb Add follower synchronization mechanism (#14510) 2020-10-21 18:04:09 +02:00