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
17341244
Commit
17341244
authored
Nov 10, 2016
by
http://jneen.net/
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix rubocop failures
parent
f7b06929
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
2 deletions
+4
-2
lib/gitlab/email/html_parser.rb
lib/gitlab/email/html_parser.rb
+4
-1
spec/lib/gitlab/email/reply_parser_spec.rb
spec/lib/gitlab/email/reply_parser_spec.rb
+0
-1
No files found.
lib/gitlab/email/html_parser.rb
View file @
17341244
...
@@ -20,7 +20,10 @@ module Gitlab
...
@@ -20,7 +20,10 @@ module Gitlab
end
end
def
filtered_html
def
filtered_html
@filtered_html
||=
(
filter_replies!
;
document
.
inner_html
)
@filtered_html
||=
begin
filter_replies!
document
.
inner_html
end
end
end
def
filtered_text
def
filtered_text
...
...
spec/lib/gitlab/email/reply_parser_spec.rb
View file @
17341244
...
@@ -209,7 +209,6 @@ describe Gitlab::Email::ReplyParser, lib: true do
...
@@ -209,7 +209,6 @@ describe Gitlab::Email::ReplyParser, lib: true do
it
"properly renders html-only email from MS Outlook"
do
it
"properly renders html-only email from MS Outlook"
do
expect
(
test_parse_body
(
fixture_file
(
"emails/outlook_html.eml"
))).
to
eq
(
"Microsoft Outlook 2010"
)
expect
(
test_parse_body
(
fixture_file
(
"emails/outlook_html.eml"
))).
to
eq
(
"Microsoft Outlook 2010"
)
end
end
end
end
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