Merge remote-tracking branch 'upstream/pull/2111'

[rails.git] / app / controllers / oauth_controller.rb

diff --git a/app/controllers/oauth_controller.rb b/app/controllers/oauth_controller.rb
index 7e7a52677ccf60105d613645465a62ea93079714..96b562b5ef4bdce00cabe31bc68e16a032b471e0 100644 (file)
--- a/app/controllers/oauth_controller.rb
+++ b/app/controllers/oauth_controller.rb
@@ -38,7 +38,7 @@ class OauthController < ApplicationController
   protected
 
   def oauth1_authorize
-    override_content_security_policy_directives(:form_action => [])
+    override_content_security_policy_directives(:form_action => []) if CSP_ENFORCE || defined?(CSP_REPORT_URL)
 
     if @token.invalidated?
       @message = t "oauth.authorize_failure.invalid"