glitchier-soc/app/lib/activitypub
Thibaut Girka 5b8a4f96de Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- `config/webpack/shared.js`:
  Upstream has changed how Tesseract.js gets included and dropped a dependency.
  The conflict is caused by glitch-soc having different code due to its
  theming system.
  Ported upstream changes.
- `lib/mastodon/version.rb`:
  Upstream refactor/code style change in a place we replaced upstream's
  repo URL with ours.
  Ported upstram changes, keeping our repo URL.
- `yarn.lock`:
  Upstream dropped dependencies, one of which was textually too close to
  a glitch-soc-specific dependency. Not a real conflict.
2020-09-01 17:02:18 +02:00
..
activity Merge branch 'master' into glitch-soc/merge-upstream 2020-08-30 16:13:08 +02:00
activity.rb Add support for dereferencing objects through bearcaps (#14683) 2020-08-30 12:34:20 +02:00
adapter.rb Add support for direct message assertions 2020-08-04 19:43:19 +02: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 Improve group processing (#14279) 2020-07-14 19:05:34 +02:00