Commit a1e1e723 authored by Warren Guy's avatar Warren Guy

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.
parent 3d61cf9f
...@@ -10,7 +10,7 @@ class EmailRejectionMailer < BaseMailer ...@@ -10,7 +10,7 @@ class EmailRejectionMailer < BaseMailer
subject: "[Rejected] #{@original_message.subject}" 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['In-Reply-To'] = @original_message.message_id
headers['References'] = @original_message.message_id headers['References'] = @original_message.message_id
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment