aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
authorRafael França <rafaelmfranca@gmail.com>2018-09-11 20:46:25 -0400
committerGitHub <noreply@github.com>2018-09-11 20:46:25 -0400
commit81174b35c6bfb183149358f3a86e9d0542dad23d (patch)
tree256d9c55c9512f887499121b67f897fe454e6220 /railties
parente09c55dc8e958d2f68be262562e4083cc25b3756 (diff)
parente8ac7af29df54140f170663fc174c5aff8e2e793 (diff)
downloadrails-81174b35c6bfb183149358f3a86e9d0542dad23d.tar.gz
rails-81174b35c6bfb183149358f3a86e9d0542dad23d.tar.bz2
rails-81174b35c6bfb183149358f3a86e9d0542dad23d.zip
Merge pull request #33483 from DylanReile/master
Disable content security policy for mailer previews
Diffstat (limited to 'railties')
-rw-r--r--railties/lib/rails/mailers_controller.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/railties/lib/rails/mailers_controller.rb b/railties/lib/rails/mailers_controller.rb
index 0b0e802358..e2d36d7654 100644
--- a/railties/lib/rails/mailers_controller.rb
+++ b/railties/lib/rails/mailers_controller.rb
@@ -10,6 +10,8 @@ class Rails::MailersController < Rails::ApplicationController # :nodoc:
helper_method :part_query, :locale_query
+ content_security_policy(false)
+
def index
@previews = ActionMailer::Preview.all
@page_title = "Mailer Previews"