From 122d59ac41a0c637b19357c2b7422002ffa0381c Mon Sep 17 00:00:00 2001
From: Evan Minto <evan.minto@gmail.com>
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/api/activitypub/activities_controller.rb | 2 --
 1 file changed, 2 deletions(-)

(limited to 'app/controllers/api/activitypub/activities_controller.rb')

diff --git a/app/controllers/api/activitypub/activities_controller.rb b/app/controllers/api/activitypub/activities_controller.rb
index 03f27c7f6..ba03738fc 100644
--- a/app/controllers/api/activitypub/activities_controller.rb
+++ b/app/controllers/api/activitypub/activities_controller.rb
@@ -8,8 +8,6 @@ class Api::Activitypub::ActivitiesController < ApiController
 
   # Show a status in AS2 format, as either an Announce (reblog) or a Create (post) activity.
   def show_status
-    headers['Access-Control-Allow-Origin'] = '*'
-
     return forbidden unless @status.permitted?
 
     if @status.reblog?
-- 
cgit