summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2015-09-24 23:28:59 +0000
committerStan Hu <stanhu@gmail.com>2015-09-24 23:28:59 +0000
commitd5e73ae63417b6593926dff81a2a63c4255d4c92 (patch)
tree0aa79a70ad1714ac373573eef4bf11e51b58b686 /doc
parent817a60894a8cb37539c9225b6619083100bc75fc (diff)
parent869bab9d68b2df9089fb8bfd42ca1bfee6e4baf3 (diff)
downloadgitlab-ce-d5e73ae63417b6593926dff81a2a63c4255d4c92.tar.gz
Merge branch 'hook-api-updates' into 'master'
Hook api updates See merge request !1429
Diffstat (limited to 'doc')
-rw-r--r--doc/api/projects.md6
1 files changed, 6 insertions, 0 deletions
diff --git a/doc/api/projects.md b/doc/api/projects.md
index 10533c73a31..96485857035 100644
--- a/doc/api/projects.md
+++ b/doc/api/projects.md
@@ -515,6 +515,8 @@ Parameters:
"push_events": "true",
"issues_events": "true",
"merge_requests_events": "true",
+ "note_events": "true",
+ "enable_ssl_verification": "true",
"created_at": "2012-10-12T17:04:47Z"
}
```
@@ -535,6 +537,8 @@ Parameters:
- `issues_events` - Trigger hook on issues events
- `merge_requests_events` - Trigger hook on merge_requests events
- `tag_push_events` - Trigger hook on push_tag events
+- `note_events` - Trigger hook on note events
+- `enable_ssl_verification` - Do SSL verification when triggering the hook
### Edit project hook
@@ -553,6 +557,8 @@ Parameters:
- `issues_events` - Trigger hook on issues events
- `merge_requests_events` - Trigger hook on merge_requests events
- `tag_push_events` - Trigger hook on push_tag events
+- `note_events` - Trigger hook on note events
+- `enable_ssl_verification` - Do SSL verification when triggering the hook
### Delete project hook