mirror of
https://github.com/mastodon/mastodon.git
synced 2024-08-20 21:08:15 -07:00
Fix ActivityPub and REST API queries setting cookies and preventing caching (#11539)
Regression from #8657
This commit is contained in:
parent
aebefc7ce9
commit
646f96d448
3 changed files with 6 additions and 0 deletions
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue