about summary refs log tree commit diff
path: root/app/controllers/statuses_controller.rb
diff options
context:
space:
mode:
authorThibG <thib@sitedethib.com>2020-06-24 17:06:26 +0200
committerGitHub <noreply@github.com>2020-06-24 17:06:26 +0200
commit8f4aff9b6fe638b26b9d0bf0fe4151c2cc214d6d (patch)
tree89b283a87f3ff82b24148636594c0837aa34b322 /app/controllers/statuses_controller.rb
parent5d12b63e79953a7596ae473706985b774d4e51a6 (diff)
parent72d193654b9369b43090a4de2e197c21c30f3f31 (diff)
Merge pull request #1361 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/controllers/statuses_controller.rb')
-rw-r--r--app/controllers/statuses_controller.rb2
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)