summaryrefslogtreecommitdiff
path: root/doc/web_hooks/web_hooks.md
diff options
context:
space:
mode:
authorValery Sizov <vsv2711@gmail.com>2015-12-09 14:28:55 +0200
committerValery Sizov <vsv2711@gmail.com>2015-12-09 14:28:55 +0200
commit9534e862667479c90a92fe1eab19d6fbef8fb50b (patch)
tree598a22bff4edc8863f4ecbbdd4267ede5f32c5d2 /doc/web_hooks/web_hooks.md
parente84e66beb1e7ce6b5678c5bbf6294450fcf5967a (diff)
parent291678d61358c141a7ba8cabf0e645408b52a8ea (diff)
downloadgitlab-ce-9534e862667479c90a92fe1eab19d6fbef8fb50b.tar.gz
Merge remote-tracking branch 'origin/master' into ce_upstream
Diffstat (limited to 'doc/web_hooks/web_hooks.md')
-rw-r--r--doc/web_hooks/web_hooks.md14
1 files changed, 9 insertions, 5 deletions
diff --git a/doc/web_hooks/web_hooks.md b/doc/web_hooks/web_hooks.md
index 8d2936a22cc..6a09b7a2301 100644
--- a/doc/web_hooks/web_hooks.md
+++ b/doc/web_hooks/web_hooks.md
@@ -61,6 +61,9 @@ X-Gitlab-Event: Push Hook
"name": "Jordi Mallach",
"email": "jordi@softcatala.org"
}
+ "added": ["CHANGELOG"],
+ "modified": ["app/controller/application.rb"],
+ "removed": []
},
{
"id": "da1560886d4f094c3e6c9ef40349f7d38b5d27d7",
@@ -70,13 +73,14 @@ X-Gitlab-Event: Push Hook
"author": {
"name": "GitLab dev user",
"email": "gitlabdev@dv6700.(none)"
- }
+ },
+ "added": ["CHANGELOG"],
+ "modified": ["app/controller/application.rb"],
+ "removed": []
}
],
- "total_commits_count": 4,
- "added": ["CHANGELOG"],
- "modified": ["app/controller/application.rb"],
- "removed": []
+ "total_commits_count": 4
+
}
```