fedi/mastodon
1
0
Fork 1
mirror of https://github.com/mastodon/mastodon.git synced 2024-11-27 15:54:32 +00:00
Code Issues Packages Projects Releases Wiki Activity
mastodon/app/controllers/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
..
base_controller.rb Add whitelist mode (#11291) 2019-07-30 11:10:46 +02:00
claims_controller.rb Add E2EE API (#13820) 2020-06-02 19:24:53 +02:00
collections_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 2020-06-09 10:39:20 +02:00
inboxes_controller.rb Change delivery failure tracking to work with hostnames instead of URLs (#13437) 2020-04-15 20:33:24 +02:00
outboxes_controller.rb Introduce ApplicationController#cache_collection_paginated_by_id (#14677) 2020-08-28 12:31:56 +02:00
replies_controller.rb Add more tests for ActivityPub controllers (#13585) 2020-05-03 16:30:36 +02:00