summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAchilleas Pipinellis <axilleas@axilleas.me>2016-01-20 16:12:00 +0000
committerAchilleas Pipinellis <axilleas@axilleas.me>2016-01-20 16:12:00 +0000
commit41c5c391b3524e3e0b2dcfbe1d4cb5d8f0f231ad (patch)
tree97273a23aa0529720fd7e34ebabb65fe193d7376
parentb4faa59728c07893fe0f6d83648bf4d76e36320a (diff)
parent96fb81ee38a3d5e5eb5dc8c95a758c4c853d6c63 (diff)
downloadgitlab-ce-41c5c391b3524e3e0b2dcfbe1d4cb5d8f0f231ad.tar.gz
Merge branch 'patch-1' into 'master'
Fixed invalid JSON in first JSON Example Just a comma missing See merge request !2487
-rw-r--r--doc/web_hooks/web_hooks.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/web_hooks/web_hooks.md b/doc/web_hooks/web_hooks.md
index 6420d65cf1b..c29037e89c2 100644
--- a/doc/web_hooks/web_hooks.md
+++ b/doc/web_hooks/web_hooks.md
@@ -56,7 +56,7 @@ X-Gitlab-Event: Push Hook
"author": {
"name": "Jordi Mallach",
"email": "jordi@softcatala.org"
- }
+ },
"added": ["CHANGELOG"],
"modified": ["app/controller/application.rb"],
"removed": []