summaryrefslogtreecommitdiff
path: root/app/mailers
diff options
context:
space:
mode:
authorJacob Vosmaer <contact@jacobvosmaer.nl>2016-02-02 15:04:54 +0100
committerJacob Vosmaer <contact@jacobvosmaer.nl>2016-02-02 15:04:54 +0100
commitd3affe8bca5f5944c6819be1261cc4da7a2c9420 (patch)
tree047472310ccd89fb43a84101a6441917c461ebf1 /app/mailers
parente08aa3df905f09f1c964fb056cba922a1d6eaa85 (diff)
parent6cffcb05882b0d3c4a02f9acf21806e25ea09ec3 (diff)
downloadgitlab-ce-lazy-blobs.tar.gz
Merge remote-tracking branch 'origin/master' into lazy-blobslazy-blobs
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