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

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

diff --git a/app/controllers/oauth2_authorizations_controller.rb b/app/controllers/oauth2_authorizations_controller.rb
index b851d19b2dd1cd6aea8661bdd8f44d2edd86f8a7..9f86e8b184e711bce1e3429be2bd96a2d016c578 100644 (file)
--- a/app/controllers/oauth2_authorizations_controller.rb
+++ b/app/controllers/oauth2_authorizations_controller.rb
@@ -4,11 +4,9 @@ class Oauth2AuthorizationsController < Doorkeeper::AuthorizationsController
   prepend_before_action :authorize_web
   before_action :set_locale
 
-  authorize_resource :class => false
+  allow_all_form_action :only => :new
 
-  def new
-    override_content_security_policy_directives(:form_action => []) if Settings.csp_enforce || Settings.key?(:csp_report_url)
+  authorize_resource :class => false
 
-    super
-  end
+  before_action :check_database_writable
 end