From 122d59ac41a0c637b19357c2b7422002ffa0381c Mon Sep 17 00:00:00 2001 From: Evan Minto Date: Tue, 25 Apr 2017 06:06:06 -0700 Subject: Change ActivityPub paging to match spec. Clean up ActivityPub outbox changes. (#2410) * Change ActivityPub paging to match spec. Clean up ActivityPub outbox changes. * Fix code style and test failures for OutboxController. * Attempt to fix CI errors. --- app/controllers/accounts_controller.rb | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'app/controllers/accounts_controller.rb') diff --git a/app/controllers/accounts_controller.rb b/app/controllers/accounts_controller.rb index d79ed142a..8eda96336 100644 --- a/app/controllers/accounts_controller.rb +++ b/app/controllers/accounts_controller.rb @@ -15,9 +15,7 @@ class AccountsController < ApplicationController render xml: AtomSerializer.render(AtomSerializer.new.feed(@account, @entries.to_a)) end - format.activitystreams2 do - headers['Access-Control-Allow-Origin'] = '*' - end + format.activitystreams2 end end -- cgit