diff options
| author | Achilleas Pipinellis <axilleas@axilleas.me> | 2016-01-21 22:59:15 +0100 |
|---|---|---|
| committer | Achilleas Pipinellis <axilleas@axilleas.me> | 2016-01-21 22:59:15 +0100 |
| commit | 308abc8db05f75da8f1cc66facb5e85bee5c69c4 (patch) | |
| tree | 6b0acf3cbcf7036fb831381cfe195ad572d6a3c8 /app/mailers/emails/projects.rb | |
| parent | a42fe49c8c953c0aa8ca20c8fb5a141447128894 (diff) | |
| parent | c176fb40a52d32edc54843a5b54884cbab1e67e1 (diff) | |
| download | gitlab-ce-308abc8db05f75da8f1cc66facb5e85bee5c69c4.tar.gz | |
Merge branch 'master' into housekeeping-doc
Diffstat (limited to 'app/mailers/emails/projects.rb')
| -rw-r--r-- | app/mailers/emails/projects.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/app/mailers/emails/projects.rb b/app/mailers/emails/projects.rb index b96418679bd..377c2999d6c 100644 --- a/app/mailers/emails/projects.rb +++ b/app/mailers/emails/projects.rb @@ -43,7 +43,7 @@ module Emails @current_user = @created_by = User.find(created_by_id) @access_level = access_level @invite_email = invite_email - + @target_url = namespace_project_url(@project.namespace, @project) mail(to: @created_by.notification_email, @@ -65,6 +65,10 @@ module Emails # used in notify layout @target_url = @message.target_url + @project = Project.find project_id + + add_project_headers + headers['X-GitLab-Author'] = @message.author_username mail(from: sender(@message.author_id, @message.send_from_committer_email?), reply_to: @message.reply_to, |