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 dca95de4e7a34b737906ba2dd524d1c7b2e3f49f..9f86e8b184e711bce1e3429be2bd96a2d016c578 100644 (file)
--- a/app/controllers/oauth2_authorizations_controller.rb
+++ b/app/controllers/oauth2_authorizations_controller.rb
@@ -3,13 +3,10 @@ class Oauth2AuthorizationsController < Doorkeeper::AuthorizationsController
 
   prepend_before_action :authorize_web
   before_action :set_locale
 
   prepend_before_action :authorize_web
   before_action :set_locale

-  before_action :allow_all_form_action, :only => [:new]

 
 

-  authorize_resource :class => false
+  allow_all_form_action :only => :new

 
 

-  private
+  authorize_resource :class => false

 
 

-  def allow_all_form_action
-    override_content_security_policy_directives(:form_action => []) if Settings.csp_enforce || Settings.key?(:csp_report_url)
-  end
+  before_action :check_database_writable

 end
 end