Add latest changes from gitlab-org/gitlab@13-4-stable-ee

2 files changed, 10 insertions, 2 deletions

diff --git a/lib/gitlab/email/hook/disable_email_interceptor.rb b/lib/gitlab/email/hook/disable_email_interceptor.rb
index 58dc1527c7a..6e2e0201684 100644
--- a/lib/gitlab/email/hook/disable_email_interceptor.rb
+++ b/lib/gitlab/email/hook/disable_email_interceptor.rb
@@ -7,7 +7,7 @@ module Gitlab
         def self.delivering_email(message)
           message.perform_deliveries = false
 
-          Rails.logger.info "Emails disabled! Interceptor prevented sending mail #{message.subject}" # rubocop:disable Gitlab/RailsLogger
+          Gitlab::AppLogger.info "Emails disabled! Interceptor prevented sending mail #{message.subject}"
         end
       end
     end
diff --git a/lib/gitlab/email/receiver.rb b/lib/gitlab/email/receiver.rb
index bf6c28b9f90..f5e47b43a9a 100644
--- a/lib/gitlab/email/receiver.rb
+++ b/lib/gitlab/email/receiver.rb
@@ -54,7 +54,8 @@ module Gitlab
       def key_from_additional_headers(mail)
         find_key_from_references(mail) ||
           find_key_from_delivered_to_header(mail) ||
-          find_key_from_envelope_to_header(mail)
+          find_key_from_envelope_to_header(mail) ||
+          find_key_from_x_envelope_to_header(mail)
       end
 
       def ensure_references_array(references)
@@ -91,6 +92,13 @@ module Gitlab
         end
       end
 
+      def find_key_from_x_envelope_to_header(mail)
+        Array(mail[:x_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