remove trailing whitespace from email bodies

1 files changed, 3 insertions, 0 deletions

diff --git a/lib/gitlab/email/reply_parser.rb b/lib/gitlab/email/reply_parser.rb
index e53a99cd8e0..ed8c1cd09f8 100644
--- a/lib/gitlab/email/reply_parser.rb
+++ b/lib/gitlab/email/reply_parser.rb
@@ -15,6 +15,9 @@ module Gitlab
 
         body = EmailReplyTrimmer.trim(body)
 
+        # [jneen] not using /\s+$/ here because that deletes empty lines
+        body = body.gsub(/[ \t]$/, '')
+
         # TODO [jneen]: do we want to allow empty-quoting? (replies only containing a blockquote)
         # EmailReplyTrimmer allows this as a special case, so we detect it manually here.
         return "" if body.lines.all? { |l| l.strip.empty? || l.start_with?('>') }