Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Jérome Perrin
gitlab-ce
Commits
ee1de011
Commit
ee1de011
authored
Apr 05, 2016
by
Robert Speicher
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Premailer shouldn't remove script tags from our emails
Closes #14943.
parent
a1c794c5
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
1 deletion
+4
-1
config/initializers/premailer.rb
config/initializers/premailer.rb
+2
-1
spec/mailers/shared/notify.rb
spec/mailers/shared/notify.rb
+2
-0
No files found.
config/initializers/premailer.rb
View file @
ee1de011
...
@@ -3,5 +3,6 @@ Premailer::Rails.config.merge!(
...
@@ -3,5 +3,6 @@ Premailer::Rails.config.merge!(
generate_text_part:
false
,
generate_text_part:
false
,
preserve_styles:
true
,
preserve_styles:
true
,
remove_comments:
true
,
remove_comments:
true
,
remove_ids:
true
remove_ids:
true
,
remove_scripts:
false
)
)
spec/mailers/shared/notify.rb
View file @
ee1de011
...
@@ -141,10 +141,12 @@ shared_examples 'a new user email' do
...
@@ -141,10 +141,12 @@ shared_examples 'a new user email' do
end
end
shared_examples
'it should have Gmail Actions links'
do
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/
}
it
{
is_expected
.
to
have_body_text
/ViewAction/
}
end
end
shared_examples
'it should not have Gmail Actions links'
do
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/
}
it
{
is_expected
.
to_not
have_body_text
/ViewAction/
}
end
end
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment