about summary refs log tree commit diff
path: root/app/controllers/activitypub/outboxes_controller.rb
diff options
context:
space:
mode:
authorThibG <thib@sitedethib.com>2019-06-07 22:15:44 +0200
committerGitHub <noreply@github.com>2019-06-07 22:15:44 +0200
commit11c28abcfebcf8827f99a86540076347f1a1edff (patch)
treeb5d615001967cf102e88fac86b8ddb3227600109 /app/controllers/activitypub/outboxes_controller.rb
parent83600198961cce9bfe82cf0f0c33286703bc86d1 (diff)
parentaec3fa35fda50e7f618dcf8b8f14e78a995583f4 (diff)
Merge pull request #1097 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/controllers/activitypub/outboxes_controller.rb')
-rw-r--r--app/controllers/activitypub/outboxes_controller.rb5
1 files changed, 1 insertions, 4 deletions
diff --git a/app/controllers/activitypub/outboxes_controller.rb b/app/controllers/activitypub/outboxes_controller.rb
index 438fa226e..5147afbf7 100644
--- a/app/controllers/activitypub/outboxes_controller.rb
+++ b/app/controllers/activitypub/outboxes_controller.rb
@@ -10,10 +10,7 @@ class ActivityPub::OutboxesController < Api::BaseController
   before_action :set_cache_headers
 
   def show
-    unless page_requested?
-      skip_session!
-      expires_in 1.minute, public: true
-    end
+    expires_in 1.minute, public: true unless page_requested?
 
     render json: outbox_presenter, serializer: ActivityPub::OutboxSerializer, adapter: ActivityPub::Adapter, content_type: 'application/activity+json'
   end