Commit 646f96d4 authored by ThibG's avatar ThibG Committed by Eugen Rochko

Fix ActivityPub and REST API queries setting cookies and preventing caching (#11539)

Regression from #8657
parent aebefc7c
......@@ -9,6 +9,8 @@ class AccountsController < ApplicationController
before_action :set_cache_headers
before_action :set_body_classes
skip_around_action :set_locale, if: -> { request.format == :json }
def show
respond_to do |format|
format.html do
......
......@@ -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
......
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment