summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAchilleas Pipinellis <axilleas@axilleas.me>2016-03-08 15:54:13 +0000
committerAchilleas Pipinellis <axilleas@axilleas.me>2016-03-08 15:54:13 +0000
commitc74b609874c528d378038b3e2fe131b62fe3eefb (patch)
treebaaa4f4db22396f3889283ca1266eac7ca5b1ed2
parent36730e8e63c0ebe16785f33cb2b740f8d67b2b25 (diff)
parentb0adc07b3ca30430549886c3b9906c24cc9d2c6a (diff)
downloadgitlab-ce-c74b609874c528d378038b3e2fe131b62fe3eefb.tar.gz
Merge branch 'patch-2' into 'master'
add link to web hooks docs Add link to web hooks docs on custom hooks docs page. See merge request !3082
-rw-r--r--doc/hooks/custom_hooks.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/hooks/custom_hooks.md b/doc/hooks/custom_hooks.md
index 0f2665a3bf7..5a4b2f43ba7 100644
--- a/doc/hooks/custom_hooks.md
+++ b/doc/hooks/custom_hooks.md
@@ -2,7 +2,7 @@
**Note: Custom git hooks must be configured on the filesystem of the GitLab
server. Only GitLab server administrators will be able to complete these tasks.
-Please explore webhooks as an option if you do not have filesystem access. For a user configurable Git Hooks interface, please see [GitLab Enterprise Edition Git Hooks](http://doc.gitlab.com/ee/git_hooks/git_hooks.html).**
+Please explore [web hooks](doc/web_hooks/web_hooks.md) as an option if you do not have filesystem access. For a user configurable Git Hooks interface, please see [GitLab Enterprise Edition Git Hooks](http://doc.gitlab.com/ee/git_hooks/git_hooks.html).**
Git natively supports hooks that are executed on different actions.
Examples of server-side git hooks include pre-receive, post-receive, and update.