diff options
| author | http://jneen.net/ <jneen@jneen.net> | 2016-12-22 00:10:35 -0800 |
|---|---|---|
| committer | http://jneen.net/ <jneen@jneen.net> | 2016-12-22 00:10:35 -0800 |
| commit | 7218daaa96badbaadf6e94b6729a74a15273935d (patch) | |
| tree | 349853ea9236f8070a4fc1f841d57468c490c1c2 | |
| parent | 1b8a576d3fe9d283ad20ebb863bd11ec58eb5fb5 (diff) | |
| download | gitlab-ce-bugfix/outlook-language-parsing.tar.gz | |
fix guard stylebugfix/outlook-language-parsing
| -rw-r--r-- | lib/gitlab/email/reply_parser.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/gitlab/email/reply_parser.rb b/lib/gitlab/email/reply_parser.rb index 7dedd5ec4aa..8c8dd1b9cef 100644 --- a/lib/gitlab/email/reply_parser.rb +++ b/lib/gitlab/email/reply_parser.rb @@ -13,7 +13,9 @@ module Gitlab encoding = body.encoding - body = EmailReplyTrimmer.trim(body) or return "" + body = EmailReplyTrimmer.trim(body) + + return '' unless body # not using /\s+$/ here because that deletes empty lines body = body.gsub(/[ \t]$/, '') |