summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/gitlab/email/html_parser.rb5
-rw-r--r--spec/lib/gitlab/email/reply_parser_spec.rb1
2 files changed, 4 insertions, 2 deletions
diff --git a/lib/gitlab/email/html_parser.rb b/lib/gitlab/email/html_parser.rb
index 51d8edb1b13..3a723b777f5 100644
--- a/lib/gitlab/email/html_parser.rb
+++ b/lib/gitlab/email/html_parser.rb
@@ -20,7 +20,10 @@ module Gitlab
end
def filtered_html
- @filtered_html ||= (filter_replies!; document.inner_html)
+ @filtered_html ||= begin
+ filter_replies!
+ document.inner_html
+ end
end
def filtered_text
diff --git a/spec/lib/gitlab/email/reply_parser_spec.rb b/spec/lib/gitlab/email/reply_parser_spec.rb
index 7a0d6ba90cc..c7a0139d32a 100644
--- a/spec/lib/gitlab/email/reply_parser_spec.rb
+++ b/spec/lib/gitlab/email/reply_parser_spec.rb
@@ -209,7 +209,6 @@ describe Gitlab::Email::ReplyParser, lib: true 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")
-
end
end
end