protect against EmailReplyTrimmer returning nil

017579fe · http://jneen.net/ · 03753ff1 · 017579fe
Commit 017579fe authored Nov 18, 2016 by http://jneen.net/
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

lib/gitlab/email/reply_parser.rb lib/gitlab/email/reply_parser.rb +1 -1

No files found.
--- a/lib/gitlab/email/reply_parser.rb
+++ b/lib/gitlab/email/reply_parser.rb
@@ -13,7 +13,7 @@ module Gitlab

        encoding = body.encoding

-        body = EmailReplyTrimmer.trim(body)
+        body = EmailReplyTrimmer.trim(body) or return ""

        # [jneen] not using /\s+$/ here because that deletes empty lines
        body = body.gsub(/[ \t]$/, '')