diff options
| author | http://jneen.net/ <jneen@jneen.net> | 2016-11-18 18:57:37 +0900 |
|---|---|---|
| committer | http://jneen.net/ <jneen@jneen.net> | 2016-12-21 09:51:41 -0800 |
| commit | 017579fe149e976fb0b2b21b234ea923913cadb2 (patch) | |
| tree | e1e4c00591f1c11ae1568d19cccfab174badef07 | |
| parent | 03753ff146a448eb66e7af12f56dcc4cf11922d9 (diff) | |
| download | gitlab-ce-017579fe149e976fb0b2b21b234ea923913cadb2.tar.gz | |
protect against EmailReplyTrimmer returning nil
| -rw-r--r-- | lib/gitlab/email/reply_parser.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/email/reply_parser.rb b/lib/gitlab/email/reply_parser.rb index ed8c1cd09f8..e714923c4d8 100644 --- 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]$/, '') |