fedi/mastodon
1
0
Fork 1
mirror of https://github.com/mastodon/mastodon.git synced 2024-12-01 00:51:55 +00:00
Code Issues Packages Projects Releases Wiki Activity
mastodon/app/controllers/activitypub
History
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.
2020-11-08 14:20:35 +01: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 Add support for reversible suspensions through ActivityPub (#14989) 2020-11-08 00:28:39 +01:00
outboxes_controller.rb Change REST API to return empty data for suspended accounts (#14765) 2020-09-11 15:16:29 +02:00
replies_controller.rb Add support for reversible suspensions through ActivityPub (#14989) 2020-11-08 00:28:39 +01:00