summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorMarin Jankovski <maxlazio@gmail.com>2015-05-08 17:07:37 +0200
committerMarin Jankovski <maxlazio@gmail.com>2015-05-08 17:07:37 +0200
commitd9b6b9201e7d4495c28035bf545ee2b85834bd5e (patch)
treea87d2cc730ad36d1cd26785f0321ed00899d7236 /doc
parent1c911b430c86d9f5f0784005191528f0829755d1 (diff)
parentf682a6adb961a54d340762a40596e058608a2e05 (diff)
downloadgitlab-ce-d9b6b9201e7d4495c28035bf545ee2b85834bd5e.tar.gz
Merge branch 'master' of github.com:gitlabhq/gitlabhq
Diffstat (limited to 'doc')
-rw-r--r--doc/system_hooks/system_hooks.md6
-rw-r--r--doc/web_hooks/web_hooks.md25
2 files changed, 31 insertions, 0 deletions
diff --git a/doc/system_hooks/system_hooks.md b/doc/system_hooks/system_hooks.md
index f9b6d37d840..b0e4613cdef 100644
--- a/doc/system_hooks/system_hooks.md
+++ b/doc/system_hooks/system_hooks.md
@@ -6,6 +6,12 @@ System hooks can be used, e.g. for logging or changing information in a LDAP ser
## Hooks request example
+**Request header**:
+
+```
+X-Gitlab-Event: System Hook
+```
+
**Project created:**
```json
diff --git a/doc/web_hooks/web_hooks.md b/doc/web_hooks/web_hooks.md
index 851f50f5e9a..01082555192 100644
--- a/doc/web_hooks/web_hooks.md
+++ b/doc/web_hooks/web_hooks.md
@@ -12,6 +12,12 @@ If you send a web hook to an SSL endpoint [the certificate will not be verified]
Triggered when you push to the repository except when pushing tags.
+**Request header**:
+
+```
+X-Gitlab-Event: Push Hook
+```
+
**Request body:**
```json
@@ -63,6 +69,13 @@ Triggered when you push to the repository except when pushing tags.
Triggered when you create (or delete) tags to the repository.
+**Request header**:
+
+```
+X-Gitlab-Event: Tag Push Hook
+```
+
+
**Request body:**
```json
@@ -92,6 +105,12 @@ Triggered when you create (or delete) tags to the repository.
Triggered when a new issue is created or an existing issue was updated/closed/reopened.
+**Request header**:
+
+```
+X-Gitlab-Event: Issue Hook
+```
+
**Request body:**
```json
@@ -126,6 +145,12 @@ Triggered when a new issue is created or an existing issue was updated/closed/re
Triggered when a new merge request is created or an existing merge request was updated/merged/closed.
+**Request header**:
+
+```
+X-Gitlab-Event: Merge Request Hook
+```
+
**Request body:**
```json