diff options
| author | Marcia Ramos <virtua.creative@gmail.com> | 2018-11-09 16:58:00 +0000 |
|---|---|---|
| committer | Steve Azzopardi <sazzopardi@gitlab.com> | 2018-11-12 11:15:07 +0000 |
| commit | bd7aaa9209182298269c35a547bc794a4bb5fa27 (patch) | |
| tree | d9fd89a6e6811833714e7997a5fd7e64ae1fad14 | |
| parent | e5d2921faa15c9d74ad69d62360b59e3c30ecd47 (diff) | |
| download | gitlab-ce-bd7aaa9209182298269c35a547bc794a4bb5fa27.tar.gz | |
Merge branch 'docs-zj-hooks-update' into 'master'
Symlinked hooks aren't executed
See merge request gitlab-org/gitlab-ce!22933
(cherry picked from commit 04c55292a5b5624aced5b42d390010e0a2de734d)
ec6363d6 Symlinked hooks aren't executed
| -rw-r--r-- | doc/administration/custom_hooks.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/administration/custom_hooks.md b/doc/administration/custom_hooks.md index c58ced7d520..60ad4bf4e8f 100644 --- a/doc/administration/custom_hooks.md +++ b/doc/administration/custom_hooks.md @@ -60,7 +60,7 @@ installations, this can be set in `gitlab-shell/config.yml`. The hooks are searched and executed in this order: -1. `<project>.git/hooks/` - symlink to `gitlab-shell/hooks` global dir +1. `gitlab-shell/hooks` directory as known to Gitaly 1. `<project>.git/hooks/<hook_name>` - executed by `git` itself, this is `gitlab-shell/hooks/<hook_name>` 1. `<project>.git/custom_hooks/<hook_name>` - per project hook (this is already existing behavior) 1. `<project>.git/custom_hooks/<hook_name>.d/*` - per project hooks |