diff options
| author | karen Carias <karen@gitlab.com> | 2015-09-30 13:33:51 -0700 |
|---|---|---|
| committer | karen Carias <karen@gitlab.com> | 2015-09-30 13:33:51 -0700 |
| commit | 126dd008e110dce5dfe7d1d076bc57f33250ee7b (patch) | |
| tree | 4ce96f2fd7e50faff65df7b556153c08d16a888c /doc/hooks/custom_hooks.md | |
| parent | 6a1d695f861e4c5251a2333c673f78705b34891f (diff) | |
| parent | 54452412f765d9e6e6166e105db9adbc7553aec2 (diff) | |
| download | gitlab-ce-126dd008e110dce5dfe7d1d076bc57f33250ee7b.tar.gz | |
solved conflict
Diffstat (limited to 'doc/hooks/custom_hooks.md')
| -rw-r--r-- | doc/hooks/custom_hooks.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/hooks/custom_hooks.md b/doc/hooks/custom_hooks.md index f7d4f3de68b..548c484bc08 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.** +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).** Git natively supports hooks that are executed on different actions. Examples of server-side git hooks include pre-receive, post-receive, and update. |