From 7218daaa96badbaadf6e94b6729a74a15273935d Mon Sep 17 00:00:00 2001
From: "http://jneen.net/" <jneen@jneen.net>
Date: Thu, 22 Dec 2016 00:10:35 -0800
Subject: [PATCH] fix guard style
---
lib/gitlab/email/reply_parser.rb | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
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]$/, '')
--
GitLab