mirrors/nyastodon
1
0
Fork 0
mirror of https://git.bsd.gay/fef/nyastodon.git synced 2024-12-28 04:13:44 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
nyastodon/app/lib/activitypub
History
Thibaut Girka 8c3c27bf06 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- `app/controllers/accounts_controller.rb`:
  Upstream change too close to a glitch-soc change related to
  instance-local toots. Merged upstream changes.
- `app/services/fan_out_on_write_service.rb`:
  Minor conflict due to glitch-soc's handling of Direct Messages,
  merged upstream changes.
- `yarn.lock`:
  Not really a conflict, caused by glitch-soc-only dependencies
  being textually too close to updated upstream dependencies.
  Merged upstream changes.
2020-08-30 16:13:08 +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 Add CLI task for rotating keys (#8466) 2018-08-26 20:21:03 +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