summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2015-10-13 17:12:51 +0000
committerStan Hu <stanhu@gmail.com>2015-10-13 17:12:51 +0000
commite0072892e888f36dcec928ba65cea307da2fbaf2 (patch)
tree192410aa29b17d2dccc8a0c4f8ee65e81d2f3d41 /doc
parentc9c538469c17b5c12c73c9ce72dc8787f381935c (diff)
parent6b739027330cb07484b71c748e30d5966f63d647 (diff)
downloadgitlab-ce-e0072892e888f36dcec928ba65cea307da2fbaf2.tar.gz
Merge branch 'add-wip-to-mr-hook-attrs' into 'master'
merge_request: add work_in_progress to MR hooks See merge request !1443
Diffstat (limited to 'doc')
-rw-r--r--doc/web_hooks/web_hooks.md6
1 files changed, 4 insertions, 2 deletions
diff --git a/doc/web_hooks/web_hooks.md b/doc/web_hooks/web_hooks.md
index c185ccfcac3..ef99a69f60a 100644
--- a/doc/web_hooks/web_hooks.md
+++ b/doc/web_hooks/web_hooks.md
@@ -314,7 +314,8 @@ X-Gitlab-Event: Note Hook
"name": "John Smith",
"email": "john@example.com"
}
- }
+ },
+ "work_in_progress": false
}
}
```
@@ -500,6 +501,7 @@ X-Gitlab-Event: Merge Request Hook
"email": "gitlabdev@dv6700.(none)"
}
},
+ "work_in_progress": false,
"url": "http://example.com/diaspora/merge_requests/1",
"action": "open"
}
@@ -537,4 +539,4 @@ When you press 'Test Hook' in GitLab, you should see something like this in the
{"before":"077a85dd266e6f3573ef7e9ef8ce3343ad659c4e","after":"95cd4a99e93bc4bbabacfa2cd10e6725b1403c60",<SNIP>}
example.com - - [14/May/2014:07:45:26 EDT] "POST / HTTP/1.1" 200 0
- -> /
-``` \ No newline at end of file
+```