about summary refs log tree commit diff
path: root/app/controllers/accounts_controller.rb
diff options
context:
space:
mode:
authorEvan Minto <evan.minto@gmail.com>2017-04-25 06:06:06 -0700
committerEugen Rochko <eugen@zeonfederated.com>2017-04-25 15:06:06 +0200
commit122d59ac41a0c637b19357c2b7422002ffa0381c (patch)
tree150a8793fcc7d51793a24b2b1df900025799dc73 /app/controllers/accounts_controller.rb
parent8b5179d006a07cf759e751e9d883bfe472cee868 (diff)
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.
Diffstat (limited to 'app/controllers/accounts_controller.rb')
-rw-r--r--app/controllers/accounts_controller.rb4
1 files changed, 1 insertions, 3 deletions
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