You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
mastodon/app/controllers/activitypub
Thibaut Girka 0437d70628 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- `app/controllers/follower_accounts_controller.rb`:
  Conflict due to upstream changing suspension logic while
  glitch-soc has an extra option to hide followers count.
  Ported upstream changes.
5 years ago
..
base_controller.rb Add support for reversible suspensions through ActivityPub (#14989) 5 years ago
claims_controller.rb Add E2EE API (#13820) 5 years ago
collections_controller.rb Merge branch 'master' into glitch-soc/merge-upstream 5 years ago
followers_synchronizations_controller.rb Add follower synchronization mechanism (#14510) 5 years ago
inboxes_controller.rb Add support for reversible suspensions through ActivityPub (#14989) 5 years ago
outboxes_controller.rb Change REST API to return empty data for suspended accounts (#14765) 5 years ago
replies_controller.rb Add support for reversible suspensions through ActivityPub (#14989) 5 years ago