summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2016-08-24 18:18:05 +0000
committerRobert Speicher <robert@gitlab.com>2016-08-24 18:18:05 +0000
commitb13dba7f25170e2f4d0b9a092c3a47851a504f48 (patch)
tree83ce47eb8d7761206d29467a1aa2cce7f1c3ead7 /doc
parentc86c7223e235e2a64c7d35b0fe352f8f56db7f32 (diff)
parent99c2f3b3c534386d1d8258fea23d3991695ff4fe (diff)
downloadgitlab-ce-b13dba7f25170e2f4d0b9a092c3a47851a504f48.tar.gz
Merge branch 'api-project-hook-wiki-page-events' into 'master'
Api project hook wiki page events ## What does this MR do? Updates project hook API for wiki page events. Also updates docs and tests for forgotten hook fields. See merge request !5969
Diffstat (limited to 'doc')
-rw-r--r--doc/api/projects.md10
1 files changed, 10 insertions, 0 deletions
diff --git a/doc/api/projects.md b/doc/api/projects.md
index 37d97b2db44..156deca932b 100644
--- a/doc/api/projects.md
+++ b/doc/api/projects.md
@@ -914,7 +914,11 @@ Parameters:
"push_events": true,
"issues_events": true,
"merge_requests_events": true,
+ "tag_push_events": true,
"note_events": true,
+ "build_events": true,
+ "pipeline_events": true,
+ "wiki_page_events": true,
"enable_ssl_verification": true,
"created_at": "2012-10-12T17:04:47Z"
}
@@ -937,6 +941,9 @@ Parameters:
- `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
+- `build_events` - Trigger hook on build events
+- `pipeline_events` - Trigger hook on pipeline events
+- `wiki_page_events` - Trigger hook on wiki page events
- `enable_ssl_verification` - Do SSL verification when triggering the hook
### Edit project hook
@@ -957,6 +964,9 @@ Parameters:
- `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
+- `build_events` - Trigger hook on build events
+- `pipeline_events` - Trigger hook on pipeline events
+- `wiki_page_events` - Trigger hook on wiki page events
- `enable_ssl_verification` - Do SSL verification when triggering the hook
### Delete project hook