diff options
| author | ThibG <thib@sitedethib.com> | 2019-08-12 23:01:19 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-12 23:01:19 +0200 |
| commit | cf421bafdf644f8c8a44b4f06f82841cbd568cdf (patch) | |
| tree | 4d1f3b2c9bdcadcf0fe53372a75ba54c0c06875a /app/controllers/statuses_controller.rb | |
| parent | aa485d6f055b93fd7a9df8b47ed96122b38af39e (diff) | |
| parent | cfca28bc874125e63e7e1a3c96d94bd5a7eca108 (diff) | |
Merge pull request #1196 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/controllers/statuses_controller.rb')
| -rw-r--r-- | app/controllers/statuses_controller.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/controllers/statuses_controller.rb b/app/controllers/statuses_controller.rb index 3d7e61e77..83c412d5c 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 |