summaryrefslogtreecommitdiff
path: root/app/mailers
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2015-10-01 01:44:50 -0700
committerStan Hu <stanhu@gmail.com>2015-10-01 01:46:08 -0700
commit2e92600b30b4e935fb8ba125d99124539545d901 (patch)
tree21b3e57cbad2664fe2d9cace6e77fb4d62af4aa2 /app/mailers
parent2714d5b8147cef39343a1c35ba099ebe6445f5e4 (diff)
downloadgitlab-ce-2e92600b30b4e935fb8ba125d99124539545d901.tar.gz
Fix Message-ID field to be RFC 2111-compliant to prevent e-mails from being dropped
Closes #2867
Diffstat (limited to 'app/mailers')
-rw-r--r--app/mailers/notify.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/mailers/notify.rb b/app/mailers/notify.rb
index db2f9654e14..50a409c3754 100644
--- a/app/mailers/notify.rb
+++ b/app/mailers/notify.rb
@@ -140,7 +140,7 @@ class Notify < BaseMailer
# * have a 'In-Reply-To' or 'References' header that references the original 'Message-ID'
#
def mail_answer_thread(model, headers = {})
- headers['Message-ID'] = SecureRandom.hex
+ headers['Message-ID'] = "<#{SecureRandom.hex}@#{Gitlab.config.gitlab.host}>"
headers['In-Reply-To'] = message_id(model)
headers['References'] = message_id(model)