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

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

diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb
index 2b6905ebb548fc9f2703d3045c0f3c282f74dfe4..a3e6f42f03db4b172607bc26285d6c79c3b0ee8b 100644 (file)
--- a/app/controllers/sessions_controller.rb
+++ b/app/controllers/sessions_controller.rb
@@ -11,9 +11,9 @@ class SessionsController < ApplicationController
 
   authorize_resource :class => false
 
 
   authorize_resource :class => false
 

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

 
 

+  def new

     referer = safe_referer(params[:referer]) if params[:referer]
 
     parse_oauth_referer referer
     referer = safe_referer(params[:referer]) if params[:referer]
 
     parse_oauth_referer referer