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

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

diff --git a/app/controllers/oauth_controller.rb b/app/controllers/oauth_controller.rb
index 0954071a56f0405517b205818468e834041b4fb9..babd27c536ffd4eaf4d813e2fce559678a2fbadc 100644 (file)
--- a/app/controllers/oauth_controller.rb
+++ b/app/controllers/oauth_controller.rb
@@ -1,5 +1,3 @@
-require "oauth/controllers/provider_controller"
-
 class OauthController < ApplicationController
   include OAuth::Controllers::ProviderController
 
@@ -41,7 +39,7 @@ class OauthController < ApplicationController
   end
 
   def oauth1_authorize
-    override_content_security_policy_directives(:form_action => []) if CSP_ENFORCE || defined?(CSP_REPORT_URL)
+    override_content_security_policy_directives(:form_action => []) if Settings.csp_enforce || Settings.key?(:csp_report_url)
 
     if @token.invalidated?
       @message = t "oauth.authorize_failure.invalid"