diff options
| author | ThibG <thib@sitedethib.com> | 2019-04-04 15:13:18 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-04 15:13:18 +0200 |
| commit | 30500dff7cbf27fbee6eb45e20cc24ca0b7a9e77 (patch) | |
| tree | e6022023d42dde628bb44880659104a87f985039 /app/controllers/activitypub/outboxes_controller.rb | |
| parent | 14bad3f472b2d9887db701409db93e511e9c6f50 (diff) | |
| parent | be6885eb93c088699465d1c50e49e8ba6d9fa3a7 (diff) | |
Merge pull request #981 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.rb | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/app/controllers/activitypub/outboxes_controller.rb b/app/controllers/activitypub/outboxes_controller.rb index be4289b21..438fa226e 100644 --- a/app/controllers/activitypub/outboxes_controller.rb +++ b/app/controllers/activitypub/outboxes_controller.rb @@ -7,8 +7,14 @@ class ActivityPub::OutboxesController < Api::BaseController before_action :set_account before_action :set_statuses + before_action :set_cache_headers def show + unless page_requested? + skip_session! + expires_in 1.minute, public: true + end + render json: outbox_presenter, serializer: ActivityPub::OutboxSerializer, adapter: ActivityPub::Adapter, content_type: 'application/activity+json' end |