From 646f96d4486499416c9a369ad8886e09e453462c Mon Sep 17 00:00:00 2001
From: ThibG <thib@sitedethib.com>
Date: Sun, 11 Aug 2019 22:59:40 +0200
Subject: Fix ActivityPub and REST API queries setting cookies and preventing
 caching (#11539)

Regression from #8657
---
 app/controllers/statuses_controller.rb | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'app/controllers/statuses_controller.rb')

diff --git a/app/controllers/statuses_controller.rb b/app/controllers/statuses_controller.rb
index 0693125ab..83131f484 100644
--- a/app/controllers/statuses_controller.rb
+++ b/app/controllers/statuses_controller.rb
@@ -18,6 +18,8 @@ class StatusesController < ApplicationController
   before_action :set_body_classes
   before_action :set_autoplay, only: :embed
 
+  skip_around_action :set_locale, if: -> { request.format == :json }
+
   content_security_policy only: :embed do |p|
     p.frame_ancestors(false)
   end
-- 
cgit