diff options
| author | Starfall <admin@plural.cafe> | 2020-07-01 12:06:19 -0500 |
|---|---|---|
| committer | Starfall <admin@plural.cafe> | 2020-07-01 12:06:19 -0500 |
| commit | 4d93b5c442ff5c9f4d640b4c7d543f0c04c120df (patch) | |
| tree | 4df391c12dc761ac99ca6421d53d8d31870b68ec /app/controllers/statuses_controller.rb | |
| parent | 5668836f56cddf3257f38a2483c1d42cacbad3a8 (diff) | |
| parent | 39a0622de70dc24275808cee9526658bd68a55ed (diff) | |
Merge branch 'glitch' into main
Diffstat (limited to 'app/controllers/statuses_controller.rb')
| -rw-r--r-- | app/controllers/statuses_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/statuses_controller.rb b/app/controllers/statuses_controller.rb index b0abad984..a6ab8828f 100644 --- a/app/controllers/statuses_controller.rb +++ b/app/controllers/statuses_controller.rb @@ -19,7 +19,7 @@ class StatusesController < ApplicationController before_action :set_autoplay, only: :embed skip_around_action :set_locale, if: -> { request.format == :json } - skip_before_action :require_functional!, only: [:show, :embed] + skip_before_action :require_functional!, only: [:show, :embed], unless: :whitelist_mode? content_security_policy only: :embed do |p| p.frame_ancestors(false) |