diff options
| author | Jenkins <jenkins@jenkins.ninjawedding.org> | 2018-03-09 00:17:17 +0000 |
|---|---|---|
| committer | Jenkins <jenkins@jenkins.ninjawedding.org> | 2018-03-09 00:17:17 +0000 |
| commit | 447d7e612753d69f043e08ebb228b21e411c8b4a (patch) | |
| tree | 80caebcff2b131898f620f89ad0858d44530d30f /app/controllers/activitypub/outboxes_controller.rb | |
| parent | 43a9a781a443a6b9296431fbcc4285b3ca6a1a57 (diff) | |
| parent | ff44b2e92d496c6027b20157fea6ebd885906bea (diff) | |
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
Diffstat (limited to 'app/controllers/activitypub/outboxes_controller.rb')
| -rw-r--r-- | app/controllers/activitypub/outboxes_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/activitypub/outboxes_controller.rb b/app/controllers/activitypub/outboxes_controller.rb index a431e3557..9ed700c1e 100644 --- a/app/controllers/activitypub/outboxes_controller.rb +++ b/app/controllers/activitypub/outboxes_controller.rb @@ -9,7 +9,7 @@ class ActivityPub::OutboxesController < Api::BaseController @statuses = @account.statuses.permitted_for(@account, signed_request_account).paginate_by_max_id(20, params[:max_id], params[:since_id]) @statuses = cache_collection(@statuses, Status) - render json: outbox_presenter, serializer: ActivityPub::CollectionSerializer, adapter: ActivityPub::Adapter, content_type: 'application/activity+json' + render json: outbox_presenter, serializer: ActivityPub::OutboxSerializer, adapter: ActivityPub::Adapter, content_type: 'application/activity+json' end private |