diff options
| -rw-r--r-- | lib/gitlab/email/reply_parser.rb | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/lib/gitlab/email/reply_parser.rb b/lib/gitlab/email/reply_parser.rb index 1ad44425c93..07860c36af8 100644 --- a/lib/gitlab/email/reply_parser.rb +++ b/lib/gitlab/email/reply_parser.rb @@ -23,15 +23,13 @@ module Gitlab private def select_body(message) - if message.multipart? - text = message.text_part || message.html_part || message + part = if message.multipart? + message.text_part || message.html_part || message else - text = message + message end - return "" unless text - - decoded = fix_charset(text) + decoded = fix_charset(part) return "" unless decoded @@ -40,7 +38,7 @@ module Gitlab return "" end - if text.content_type =~ %r(text/html) + if (part.content_type || '').include? 'text/html' HTMLParser.parse_reply(decoded) else decoded |