summaryrefslogtreecommitdiff
path: root/app/mailers
diff options
context:
space:
mode:
authorWarren Guy <warren@guy.net.au>2016-01-30 18:30:51 +0800
committerWarren Guy <warren@guy.net.au>2016-01-30 18:30:53 +0800
commita1e1e72375c6b8f511c779c74b3dd1073afff6c1 (patch)
tree385eb3b2f852daa7b836b507668e21180ba573ec /app/mailers
parent3d61cf9f1bfaa9d0ffd5cc36e54162c0f0b59c61 (diff)
downloadgitlab-ce-a1e1e72375c6b8f511c779c74b3dd1073afff6c1.tar.gz
Generate valid 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.
Diffstat (limited to 'app/mailers')
-rw-r--r--app/mailers/email_rejection_mailer.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/mailers/email_rejection_mailer.rb b/app/mailers/email_rejection_mailer.rb
index 883f1c73ad4..76db31a4c45 100644
--- 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