Commit 21d660a5 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch 'web_hook_extend' into 'master'

Web Hook sends email of pusher

See merge request !1630
parents 67eb6e92 3d9a766d
...@@ -20,6 +20,7 @@ v 7.9.0 (unreleased) ...@@ -20,6 +20,7 @@ v 7.9.0 (unreleased)
- Add brakeman (security scanner for Ruby on Rails) - Add brakeman (security scanner for Ruby on Rails)
- Slack username and channel options - Slack username and channel options
- Add grouped milestones from all projects to dashboard. - Add grouped milestones from all projects to dashboard.
- Web hook sends pusher email as well as commiter
v 7.8.1 v 7.8.1
- Fix run of custom post receive hooks - Fix run of custom post receive hooks
......
...@@ -21,6 +21,7 @@ Triggered when you push to the repository except when pushing tags. ...@@ -21,6 +21,7 @@ Triggered when you push to the repository except when pushing tags.
"ref": "refs/heads/master", "ref": "refs/heads/master",
"user_id": 4, "user_id": 4,
"user_name": "John Smith", "user_name": "John Smith",
"user_email": "john@example.com",
"project_id": 15, "project_id": 15,
"repository": { "repository": {
"name": "Diaspora", "name": "Diaspora",
......
...@@ -9,6 +9,7 @@ module Gitlab ...@@ -9,6 +9,7 @@ module Gitlab
# ref: String, # ref: String,
# user_id: String, # user_id: String,
# user_name: String, # user_name: String,
# user_email: String
# project_id: String, # project_id: String,
# repository: { # repository: {
# name: String, # name: String,
...@@ -35,6 +36,7 @@ module Gitlab ...@@ -35,6 +36,7 @@ module Gitlab
checkout_sha: checkout_sha(project.repository, newrev, ref), checkout_sha: checkout_sha(project.repository, newrev, ref),
user_id: user.id, user_id: user.id,
user_name: user.name, user_name: user.name,
user_email: user.email,
project_id: project.id, project_id: project.id,
repository: { repository: {
name: project.name, name: project.name,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment