summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2016-04-05 17:03:34 -0400
committerRobert Speicher <rspeicher@gmail.com>2016-04-05 17:03:34 -0400
commitee1de011d1a9e2990fd56a794bbff6b0ec374d00 (patch)
tree80b9c01ddf3093bdf83dc2a0f188e41335ff4bdf
parenta1c794c5917e9dad414e54cdd4a6ae920c23dda2 (diff)
downloadgitlab-ce-ee1de011d1a9e2990fd56a794bbff6b0ec374d00.tar.gz
Premailer shouldn't remove script tags from our emails
Closes #14943.
-rw-r--r--config/initializers/premailer.rb3
-rw-r--r--spec/mailers/shared/notify.rb2
2 files changed, 4 insertions, 1 deletions
diff --git a/config/initializers/premailer.rb b/config/initializers/premailer.rb
index a44316bc3a4..b9176688bc4 100644
--- a/config/initializers/premailer.rb
+++ b/config/initializers/premailer.rb
@@ -3,5 +3,6 @@ Premailer::Rails.config.merge!(
generate_text_part: false,
preserve_styles: true,
remove_comments: true,
- remove_ids: true
+ remove_ids: true,
+ remove_scripts: false
)
diff --git a/spec/mailers/shared/notify.rb b/spec/mailers/shared/notify.rb
index 56a6dbf96f9..5a85cb501dd 100644
--- a/spec/mailers/shared/notify.rb
+++ b/spec/mailers/shared/notify.rb
@@ -141,10 +141,12 @@ shared_examples 'a new user email' do
end
shared_examples 'it should have Gmail Actions links' do
+ it { is_expected.to have_body_text '<script type="application/ld+json">' }
it { is_expected.to have_body_text /ViewAction/ }
end
shared_examples 'it should not have Gmail Actions links' do
+ it { is_expected.to_not have_body_text '<script type="application/ld+json">' }
it { is_expected.to_not have_body_text /ViewAction/ }
end