diff options
| author | Rémy Coutable <remy@rymai.me> | 2018-05-30 12:01:25 +0300 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-05-30 12:01:25 +0300 |
| commit | a0073f056171d8a0842cda5b4a73bbdfc58af018 (patch) | |
| tree | 8b80bb517d49eea32dde9eaa4e89809ed7b1cc65 | |
| parent | b2d8d161a060f9e257845ae5813395761132cb13 (diff) | |
| parent | 6e52fb1b9b9c6180beb9fb0caa6270964438505d (diff) | |
Merge branch 'patch-25' into 'master'
add CI as option in place of custom hooks
See merge request gitlab-org/gitlab-ce!19023
| -rw-r--r-- | doc/administration/custom_hooks.md | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/doc/administration/custom_hooks.md b/doc/administration/custom_hooks.md index 960970aea30..effd5e36d29 100644 --- a/doc/administration/custom_hooks.md +++ b/doc/administration/custom_hooks.md @@ -3,7 +3,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 +Please explore [webhooks] and [CI] as an option if you do not have filesystem access. For a user configurable Git hook interface, see [Push Rules](https://docs.gitlab.com/ee/push_rules/push_rules.html), available in GitLab Enterprise Edition. @@ -80,6 +80,7 @@ STDERR takes precedence over STDOUT.  +[CI]: ../ci/readme.md [hooks]: https://git-scm.com/book/en/v2/Customizing-Git-Git-Hooks#Server-Side-Hooks [webhooks]: ../user/project/integrations/webhooks.md [5073]: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5073 |