diff options
| author | Douwe Maan <douwe@gitlab.com> | 2018-07-27 13:54:09 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2018-07-27 13:54:09 +0000 |
| commit | 91f7d8a2405670687b765c1dde50a2e3623e0960 (patch) | |
| tree | e9904444ca2b86ce5a258ab6da449cfdf70df460 /app | |
| parent | 5f84509c05c63130143a9d9ac0c69a00ea10cf4c (diff) | |
| parent | b1f236164e835a8d21bc19c343c9e211fdcb65b6 (diff) | |
| download | gitlab-ce-91f7d8a2405670687b765c1dde50a2e3623e0960.tar.gz | |
Merge branch 'tc-reorder-mail-notify-references' into 'master'
Put fallback reply-key address first in the References header
See merge request gitlab-org/gitlab-ce!20871
Diffstat (limited to 'app')
| -rw-r--r-- | app/mailers/notify.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/mailers/notify.rb b/app/mailers/notify.rb index 1db1482d6b7..0e1e39501f5 100644 --- a/app/mailers/notify.rb +++ b/app/mailers/notify.rb @@ -124,7 +124,7 @@ class Notify < BaseMailer fallback_reply_message_id = "<reply-#{reply_key}@#{Gitlab.config.gitlab.host}>".freeze headers['References'] ||= [] - headers['References'] << fallback_reply_message_id + headers['References'].unshift(fallback_reply_message_id) @reply_by_email = true end @@ -158,7 +158,7 @@ class Notify < BaseMailer def mail_answer_thread(model, headers = {}) headers['Message-ID'] = "<#{SecureRandom.hex}@#{Gitlab.config.gitlab.host}>" headers['In-Reply-To'] = message_id(model) - headers['References'] = message_id(model) + headers['References'] = [message_id(model)] headers[:subject]&.prepend('Re: ') |