diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-10-15 11:26:58 +0200 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-10-15 11:26:58 +0200 |
| commit | 95f0440a7823a927ebba1557b091c12255e49ac4 (patch) | |
| tree | fa6d130f2baff18e7a70d74dafe79e20da35babe /doc/web_hooks | |
| parent | 4a5b77188ec7525d1c3a1ee925c8791f841b040c (diff) | |
| parent | 123669a55107514798ba531ba3a744b3ec8503ee (diff) | |
| download | gitlab-ce-95f0440a7823a927ebba1557b091c12255e49ac4.tar.gz | |
Merge branch 'master' into rs-redactor-filter
Diffstat (limited to 'doc/web_hooks')
| -rw-r--r-- | doc/web_hooks/web_hooks.md | 6 |
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 +``` |