diff options
| author | Valery Sizov <vsv2711@gmail.com> | 2015-03-04 20:24:34 +0200 |
|---|---|---|
| committer | Valery Sizov <vsv2711@gmail.com> | 2015-03-04 20:29:25 +0200 |
| commit | 3d9a766d9f465ef97b259be860891ce35bd04d0b (patch) | |
| tree | 99a2722082ebcf557f707bf18d6e744d02819bd8 | |
| parent | 8be36a2c0f8952fd4daae8b7007e687966b5a75f (diff) | |
| download | gitlab-ce-3d9a766d9f465ef97b259be860891ce35bd04d0b.tar.gz | |
Web Hook sends email of pusher
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | doc/web_hooks/web_hooks.md | 1 | ||||
| -rw-r--r-- | lib/gitlab/push_data_builder.rb | 2 |
3 files changed, 4 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG index 3b3baf56706..3d322aadb02 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -19,6 +19,7 @@ v 7.9.0 (unreleased) - Add a service to send updates to an Irker gateway (Romain Coltel) - Add brakeman (security scanner for Ruby on Rails) - Slack username and channel options + - Web hook sends pusher email as well as commiter v 7.8.1 - Fix run of custom post receive hooks diff --git a/doc/web_hooks/web_hooks.md b/doc/web_hooks/web_hooks.md index 29ef5b59bac..3cccd84b063 100644 --- a/doc/web_hooks/web_hooks.md +++ b/doc/web_hooks/web_hooks.md @@ -21,6 +21,7 @@ Triggered when you push to the repository except when pushing tags. "ref": "refs/heads/master", "user_id": 4, "user_name": "John Smith", + "user_email": "john@example.com", "project_id": 15, "repository": { "name": "Diaspora", diff --git a/lib/gitlab/push_data_builder.rb b/lib/gitlab/push_data_builder.rb index 9aa5c8967a7..6a72efa7221 100644 --- a/lib/gitlab/push_data_builder.rb +++ b/lib/gitlab/push_data_builder.rb @@ -9,6 +9,7 @@ module Gitlab # ref: String, # user_id: String, # user_name: String, + # user_email: String # project_id: String, # repository: { # name: String, @@ -35,6 +36,7 @@ module Gitlab checkout_sha: checkout_sha(project.repository, newrev, ref), user_id: user.id, user_name: user.name, + user_email: user.email, project_id: project.id, repository: { name: project.name, |