luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-11-10 00:46:12 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/spec/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
adapter_spec.rb Remove unused ActivityPub @context values depending on response (#10378) 2019-03-27 15:55:23 +01:00
dereferencer_spec.rb Add support for dereferencing objects through bearcaps (#14683) 2020-08-30 12:34:20 +02:00
linked_data_signature_spec.rb
tag_manager_spec.rb Remove Atom feeds and old URLs in the form of GET /:username/updates/:id (#11247) 2019-07-07 16:16:51 +02:00