glitchier-soc/app/controllers/activitypub
Thibaut Girka 612158f4f6 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- `app/controllers/activitypub/collections_controller.rb`:
  Conflict caused because we have additional code to make sure pinned
  local-only toots don't get rendered on the ActivityPub endpoints.
  Ported upstream changes.
2020-09-07 09:21:38 +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-09-07 09:21:38 +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 Add outbox attribute to instance actor (#14721) 2020-09-02 18:42:50 +02:00
replies_controller.rb Add more tests for ActivityPub controllers (#13585) 2020-05-03 16:30:36 +02:00