Add latest changes from gitlab-org/gitlab@13-9-stable-eev13.9.0-rc42

1 files changed, 9 insertions, 1 deletions

diff --git a/lib/gitlab/email/handler/service_desk_handler.rb b/lib/gitlab/email/handler/service_desk_handler.rb
index f66e8a8794f..d1dd616385d 100644
--- a/lib/gitlab/email/handler/service_desk_handler.rb
+++ b/lib/gitlab/email/handler/service_desk_handler.rb
@@ -35,7 +35,11 @@ module Gitlab
           raise ProjectNotFound if project.nil?
 
           create_issue!
-          send_thank_you_email! if from_address
+
+          if from_address
+            add_email_participant
+            send_thank_you_email!
+          end
         end
 
         def metrics_params
@@ -146,6 +150,10 @@ module Gitlab
         def author
           User.support_bot
         end
+
+        def add_email_participant
+          @issue.issue_email_participants.create(email: from_address)
+        end
       end
     end
   end