diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-10-01 16:28:10 +0200 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-10-01 16:28:10 +0200 |
| commit | 63bbe42c9cc5c23e090849022df60b2e45ee35d5 (patch) | |
| tree | 95be812f6298499ed0f5fb8c160f06c7ca472ebe /app | |
| parent | 73520b4307a70f948acca586a9df56c9618feba6 (diff) | |
| parent | 2e92600b30b4e935fb8ba125d99124539545d901 (diff) | |
| download | gitlab-ce-63bbe42c9cc5c23e090849022df60b2e45ee35d5.tar.gz | |
Merge branch 'stanhu/gitlab-ce-fix-message-id-notify'
Diffstat (limited to 'app')
| -rw-r--r-- | app/mailers/notify.rb | 2 |
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) |