summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZeger-Jan van de Weg <git@zjvandeweg.nl>2018-11-09 09:33:56 +0100
committerZeger-Jan van de Weg <git@zjvandeweg.nl>2018-11-09 09:33:56 +0100
commitec6363d6357cccf96ff71c168c5a42f756a98fc4 (patch)
tree59ed1756eb76d687d81707ae8f15c2e61ab8327e
parent44d9d72b259bea05fd66d8ae25c9a06aefc93dd1 (diff)
downloadgitlab-ce-ec6363d6357cccf96ff71c168c5a42f756a98fc4.tar.gz
Symlinked hooks aren't executeddocs-zj-hooks-update
This recently changed on the Gitaly side, but now spotted this in the docs for the next release. Updated to be more precise, and to signal users should not want control over this specific hook location.
-rw-r--r--doc/administration/custom_hooks.md2
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