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

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

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 3afb17f470afb5668a2c2be34e60696f4c57f952..db4ae9ad392f20f91a60d6c251f8244633cc7d34 100644 (file)
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -4,6 +4,7 @@ class ApplicationController < ActionController::Base
   protect_from_forgery :with => :exception
 
   before_action :fetch_body
+  around_action :better_errors_allow_inline, :if => proc { Rails.env.development? }
 
   attr_accessor :current_user
   helper_method :current_user
@@ -455,6 +456,17 @@ class ApplicationController < ActionController::Base
     end
   end
 
+  def better_errors_allow_inline
+    yield
+  rescue StandardError
+    append_content_security_policy_directives(
+      :script_src => %w['unsafe-inline'],
+      :style_src => %w['unsafe-inline']
+    )
+
+    raise
+  end
+
   private
 
   # extract authorisation credentials from headers, returns user = nil if none