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/api/base_controller.rb | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'app/controllers/api')

diff --git a/app/controllers/api/base_controller.rb b/app/controllers/api/base_controller.rb
index 109e38ffa..de8fff30e 100644
--- a/app/controllers/api/base_controller.rb
+++ b/app/controllers/api/base_controller.rb
@@ -14,6 +14,8 @@ class Api::BaseController < ApplicationController
 
   protect_from_forgery with: :null_session
 
+  skip_around_action :set_locale
+
   rescue_from ActiveRecord::RecordInvalid, Mastodon::ValidationError do |e|
     render json: { error: e.to_s }, status: 422
   end
-- 
cgit