mastodon/app/controllers/activitypub
Claire 3160e050a9 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `app/helpers/accounts_helper.rb`:
  Conflict due to upstream changing how followers count is displayed while we
  have an option to hide followers count.
  Ported upstream change.
- `app/views/accounts/_header.html.haml`:
  Conflict due to upstream changing how followers count is displayed while we
  have an option to hide followers count.
  Ported upstream change.
- `app/views/directories/index.html.haml`:
  Conflict due to upstream changing how followers count is displayed while we
  have an option to hide followers count.
  Ported upstream change.
2021-07-08 16:17:19 +02:00
..
base_controller.rb Add support for reversible suspensions through ActivityPub (#14989) 2020-11-08 00:28:39 +01: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
followers_synchronizations_controller.rb Add follower synchronization mechanism (#14510) 2020-10-21 18:04:09 +02:00
inboxes_controller.rb Skip processing Update activities on unknown accounts (#15514) 2021-01-08 12:26:29 +01:00
outboxes_controller.rb Fix anonymous access to outbox not being cached by the reverse proxy (#16458) 2021-07-03 21:13:47 +02:00
replies_controller.rb Add support for reversible suspensions through ActivityPub (#14989) 2020-11-08 00:28:39 +01:00