summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhttp://jneen.net/ <jneen@jneen.net>2016-11-10 17:40:53 +0900
committerhttp://jneen.net/ <jneen@jneen.net>2016-11-17 11:59:44 +0900
commit17341244337511a239bb7a262236b9896a0bf76d (patch)
tree7645ee3714d6b1c4feeaf5d2b5d3ed770e19dbfd
parentf7b0692912e0679a3e2e77b2d1bfaf305fba473a (diff)
downloadgitlab-ce-17341244337511a239bb7a262236b9896a0bf76d.tar.gz
fix rubocop failures
-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