diff options
| author | Zeger-Jan van de Weg <mail@zjvandeweg.nl> | 2015-12-09 11:59:25 +0100 |
|---|---|---|
| committer | Zeger-Jan van de Weg <mail@zjvandeweg.nl> | 2016-01-09 12:41:22 +0100 |
| commit | 58867eff46dc6886b85bfe5a787341f224d09421 (patch) | |
| tree | 676d1b1705678080f75a17542d998afbd3172a7e /app/mailers/notify.rb | |
| parent | c81647ae8c5dc68ac8d7dd2970a53b31bc656a1d (diff) | |
| download | gitlab-ce-58867eff46dc6886b85bfe5a787341f224d09421.tar.gz | |
Unsubscribe from thread through link in email footer
Diffstat (limited to 'app/mailers/notify.rb')
| -rw-r--r-- | app/mailers/notify.rb | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/app/mailers/notify.rb b/app/mailers/notify.rb index 3bbdd9cee76..e1cd075a978 100644 --- a/app/mailers/notify.rb +++ b/app/mailers/notify.rb @@ -107,10 +107,9 @@ class Notify < BaseMailer end headers["X-GitLab-#{model.class.name}-ID"] = model.id + headers['X-GitLab-Reply-Key'] = reply_key - if reply_key - headers['X-GitLab-Reply-Key'] = reply_key - + if Gitlab::IncomingEmail.enabled? address = Mail::Address.new(Gitlab::IncomingEmail.reply_address(reply_key)) address.display_name = @project.name_with_namespace |