Merge branch 'generate-valid-message-id-for-email-rejections' into 'master'

Generate valid (RFC 2111) Message-ID in email rejection mailer Use a Message-ID that is RFC 2111 compliant. This fix is consistent with how the Message-ID is generated in the 'notify' mailer. See merge request !2656

Merge branch 'generate-valid-message-id-for-email-rejections' into 'master'
680d66db · Douwe Maan · ded170eb · a1e1e723 · 680d66db
Commit 680d66db authored Feb 02, 2016 by Douwe Maan
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

email_rejection_mailer.rb app/mailers/email_rejection_mailer.rb +1 -1

No files found.
--- a/app/mailers/email_rejection_mailer.rb
+++ b/app/mailers/email_rejection_mailer.rb
@@ -10,7 +10,7 @@ class EmailRejectionMailer < BaseMailer
      subject: "[Rejected] #{@original_message.subject}"
    }

-    headers['Message-ID'] = SecureRandom.hex
+    headers['Message-ID'] = "<#{SecureRandom.hex}@#{Gitlab.config.gitlab.host}>"
    headers['In-Reply-To'] = @original_message.message_id
    headers['References'] = @original_message.message_id