diff options
| author | Douwe Maan <douwe@gitlab.com> | 2016-02-02 15:25:18 +0300 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2016-02-02 15:25:18 +0300 |
| commit | 680d66db9e620bffed5bcacb902602009c45483e (patch) | |
| tree | 2984314bb7066cba94b1d87398937e6d005fa49f | |
| parent | ded170eb2ee8a29fbc1a250ac5e664dd71728a75 (diff) | |
| parent | a1e1e72375c6b8f511c779c74b3dd1073afff6c1 (diff) | |
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
| -rw-r--r-- | app/mailers/email_rejection_mailer.rb | 2 |
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 |