summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2016-01-19 21:23:54 +0000
committerRobert Speicher <robert@gitlab.com>2016-01-19 21:23:54 +0000
commit1f9c360d7ba8dc2a35321c631bbbcf624b9d8bd3 (patch)
tree209e740f6c9079dfd0fb059eb9256dd7831c22a1 /lib
parentb9fca47854dd92415e2d4d3b68e2e967fee2d67b (diff)
parent84124380e815e549f50d82051b2b546c12d9a724 (diff)
downloadgitlab-ce-1f9c360d7ba8dc2a35321c631bbbcf624b9d8bd3.tar.gz
Merge branch 'add_email_headers' into 'master'
Added X-GitLab-... headers to emails from CI and Email On Push services Fixes #2098 This adds the 'X-GitLab-Project', 'X-GitLab-Project-Id' and 'X-GitLab-Project-Path' headers to emails from CI and Email On Push in a way that it is done currently for merge requests and issues emails. Additionally, CI emails will have 'X-GitLab-Build-Status' header with either 'fail' or 'success'. Emails from Email On Push will include 'X-Gitlab-Author' header containing the username of user who did the push. See merge request !2159
Diffstat (limited to 'lib')
-rw-r--r--lib/gitlab/email/message/repository_push.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/gitlab/email/message/repository_push.rb b/lib/gitlab/email/message/repository_push.rb
index a2eb7a70bd2..a05ffeb9cd2 100644
--- a/lib/gitlab/email/message/repository_push.rb
+++ b/lib/gitlab/email/message/repository_push.rb
@@ -9,6 +9,7 @@ module Gitlab
delegate :namespace, :name_with_namespace, to: :project, prefix: :project
delegate :name, to: :author, prefix: :author
+ delegate :username, to: :author, prefix: :author
def initialize(notify, project_id, recipient, opts = {})
raise ArgumentError, 'Missing options: author_id, ref, action' unless