diff options
| author | Evan Minto <evan.minto@gmail.com> | 2017-04-25 06:06:06 -0700 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2017-04-25 15:06:06 +0200 |
| commit | 122d59ac41a0c637b19357c2b7422002ffa0381c (patch) | |
| tree | 150a8793fcc7d51793a24b2b1df900025799dc73 /app/controllers/api/activitypub/activities_controller.rb | |
| parent | 8b5179d006a07cf759e751e9d883bfe472cee868 (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/api/activitypub/activities_controller.rb')
| -rw-r--r-- | app/controllers/api/activitypub/activities_controller.rb | 2 |
1 files changed, 0 insertions, 2 deletions
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? |