summaryrefslogtreecommitdiff
path: root/doc/web_hooks
diff options
context:
space:
mode:
authorPhilipp Hansch <dev@phansch.net>2014-04-23 21:00:26 +0200
committerPhilipp Hansch <dev@phansch.net>2014-04-23 21:00:26 +0200
commita4bf8037fbd18a27d83a8ee1943978ad241257ce (patch)
treea3deb159ae65829601c3c8378b4ee5b4411997d6 /doc/web_hooks
parente54b457ea31eff54d031b7092a2a78dc81c69a63 (diff)
downloadgitlab-ce-a4bf8037fbd18a27d83a8ee1943978ad241257ce.tar.gz
Multiple grammar/typo fixes in web hooks help
Diffstat (limited to 'doc/web_hooks')
-rw-r--r--doc/web_hooks/web_hooks.md10
1 files changed, 5 insertions, 5 deletions
diff --git a/doc/web_hooks/web_hooks.md b/doc/web_hooks/web_hooks.md
index f80891e264d..5ad0c8a138f 100644
--- a/doc/web_hooks/web_hooks.md
+++ b/doc/web_hooks/web_hooks.md
@@ -2,16 +2,16 @@ Project web hooks allow you to trigger an URL if new code is pushed or a new iss
---
-You can configure web hook to listen for specific events like pushes, issues, merge requests.
-GitLab will send POST request with data to web hook URL.
-Web Hooks can be used to update an external issue tracker, trigger CI builds, update a backup mirror, or even deploy to your production server.
+You can configure web hooks to listen for specific events like pushes, issues or merge requests.
+GitLab will send a POST request with data to the web hook URL.
+Web hooks can be used to update an external issue tracker, trigger CI builds, update a backup mirror, or even deploy to your production server.
If you send a web hook to an SSL endpoint [the certificate will not be verified](https://gitlab.com/gitlab-org/gitlab-ce/blob/ccd617e58ea71c42b6b073e692447d0fe3c00be6/app/models/web_hook.rb#L35) since many people use self-signed certificates.
---
#### Push events
-Triggered when you push to the repository except pushing tags.
+Triggered when you push to the repository except when pushing tags.
**Request body:**
@@ -84,7 +84,7 @@ Triggered when a new issue is created or an existing issue was updated/closed/re
#### Merge request events
-Triggered when a new merge request is created or an existing merge request was updated/merges/closed.
+Triggered when a new merge request is created or an existing merge request was updated/merged/closed.
**Request body:**