diff options
| author | Marcia Ramos <virtua.creative@gmail.com> | 2018-11-09 16:58:00 +0000 |
|---|---|---|
| committer | Marcia Ramos <virtua.creative@gmail.com> | 2018-11-09 16:58:00 +0000 |
| commit | 04c55292a5b5624aced5b42d390010e0a2de734d (patch) | |
| tree | 4af2376dcf0835d74642385ed1b5dff9e3ab81fd | |
| parent | b7951d682e6f72be55f42e30e415fba71ad43cc9 (diff) | |
| parent | ec6363d6357cccf96ff71c168c5a42f756a98fc4 (diff) | |
| download | gitlab-ce-34758-group-cluster-controller.tar.gz | |
Merge branch 'docs-zj-hooks-update' into 'master'34758-group-cluster-controller
Symlinked hooks aren't executed
See merge request gitlab-org/gitlab-ce!22933
| -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 |