Add latest changes from gitlab-org/gitlab@master

1 files changed, 9 insertions, 1 deletions

diff --git a/lib/gitlab/email/receiver.rb b/lib/gitlab/email/receiver.rb
index 847260b2e0f..f028102da9b 100644
--- a/lib/gitlab/email/receiver.rb
+++ b/lib/gitlab/email/receiver.rb
@@ -66,7 +66,8 @@ module Gitlab
 
       def key_from_additional_headers(mail)
         find_key_from_references(mail) ||
-          find_key_from_delivered_to_header(mail)
+          find_key_from_delivered_to_header(mail) ||
+          find_key_from_envelope_to_header(mail)
       end
 
       def ensure_references_array(references)
@@ -96,6 +97,13 @@ module Gitlab
         end
       end
 
+      def find_key_from_envelope_to_header(mail)
+        Array(mail[:envelope_to]).find do |header|
+          key = Gitlab::IncomingEmail.key_from_address(header.value)
+          break key if key
+        end
+      end
+
       def ignore_auto_reply!(mail)
         if auto_submitted?(mail) || auto_replied?(mail)
           raise AutoGeneratedEmailError