Add latest changes from gitlab-org/gitlab@master

2 files changed, 10 insertions, 4 deletions

diff --git a/lib/gitlab/email/handler/service_desk_handler.rb b/lib/gitlab/email/handler/service_desk_handler.rb
index c24ec347dd6..8d73aa842be 100644
--- a/lib/gitlab/email/handler/service_desk_handler.rb
+++ b/lib/gitlab/email/handler/service_desk_handler.rb
@@ -108,7 +108,7 @@ module Gitlab
         end
 
         def message_including_template
-          description = message_including_reply
+          description = process_message(trim_reply: false, allow_only_quotes: true)
           template_content = service_desk_setting&.issue_template_content
 
           if template_content.present?
diff --git a/lib/gitlab/email/reply_parser.rb b/lib/gitlab/email/reply_parser.rb
index 0f0f4800062..d39fa139abb 100644
--- a/lib/gitlab/email/reply_parser.rb
+++ b/lib/gitlab/email/reply_parser.rb
@@ -4,12 +4,13 @@
 module Gitlab
   module Email
     class ReplyParser
-      attr_accessor :message
+      attr_accessor :message, :allow_only_quotes
 
-      def initialize(message, trim_reply: true, append_reply: false)
+      def initialize(message, trim_reply: true, append_reply: false, allow_only_quotes: false)
         @message = message
         @trim_reply = trim_reply
         @append_reply = append_reply
+        @allow_only_quotes = allow_only_quotes
       end
 
       def execute
@@ -25,7 +26,12 @@ module Gitlab
         # NOTE: We currently don't support empty quotes.
         # 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?('>') }
+        #
+        # If allow_only_quotes is true a message where all lines starts with ">" is allowed.
+        # This could happen if an email has an empty quote, forwarded without any new content.
+        return "" if body.lines.all? do |l|
+          l.strip.empty? || (!allow_only_quotes && l.start_with?('>'))
+        end
 
         encoded_body = body.force_encoding(encoding).encode("UTF-8")
         return encoded_body unless @append_reply