From 400ada4375e214a8e7d3726eb1f9567676ba0727 Mon Sep 17 00:00:00 2001 From: Stan Hu Date: Wed, 16 Sep 2020 16:11:43 -0700 Subject: Clarify location of server hooks and link documentation As mentioned in https://gitlab.com/gitlab-org/gitaly/-/issues/1226#note_202581431, I was confused by the new location of global server hooks after reading the comments in these scripts. This change makes it clear that the default location of the custom server hooks hasn't actually moved. Only the specific gitlab-shell hook has been moved to the Gitaly directory. --- hooks/post-receive | 6 +++++- hooks/pre-receive | 6 +++++- hooks/update | 6 +++++- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/hooks/post-receive b/hooks/post-receive index 73740da..b400611 100755 --- a/hooks/post-receive +++ b/hooks/post-receive @@ -1,4 +1,8 @@ #!/bin/sh -echo "The gitlab-shell hooks have been migrated to Gitaly, see https://gitlab.com/gitlab-org/gitaly/issues/1226" +echo "This gitlab-shell hook has been migrated to Gitaly. See https://gitlab.com/gitlab-org/gitaly/issues/1226." +echo +echo "Note that global server hooks still reside in a subdirectory here by default." +echo "For example, pre-receive.d/ holds custom pre-receive hooks." +echo "See https://docs.gitlab.com/ee/administration/server_hooks.html#create-a-global-server-hook-for-all-repositories for more information." exit 1 diff --git a/hooks/pre-receive b/hooks/pre-receive index 73740da..b400611 100755 --- a/hooks/pre-receive +++ b/hooks/pre-receive @@ -1,4 +1,8 @@ #!/bin/sh -echo "The gitlab-shell hooks have been migrated to Gitaly, see https://gitlab.com/gitlab-org/gitaly/issues/1226" +echo "This gitlab-shell hook has been migrated to Gitaly. See https://gitlab.com/gitlab-org/gitaly/issues/1226." +echo +echo "Note that global server hooks still reside in a subdirectory here by default." +echo "For example, pre-receive.d/ holds custom pre-receive hooks." +echo "See https://docs.gitlab.com/ee/administration/server_hooks.html#create-a-global-server-hook-for-all-repositories for more information." exit 1 diff --git a/hooks/update b/hooks/update index 73740da..b400611 100755 --- a/hooks/update +++ b/hooks/update @@ -1,4 +1,8 @@ #!/bin/sh -echo "The gitlab-shell hooks have been migrated to Gitaly, see https://gitlab.com/gitlab-org/gitaly/issues/1226" +echo "This gitlab-shell hook has been migrated to Gitaly. See https://gitlab.com/gitlab-org/gitaly/issues/1226." +echo +echo "Note that global server hooks still reside in a subdirectory here by default." +echo "For example, pre-receive.d/ holds custom pre-receive hooks." +echo "See https://docs.gitlab.com/ee/administration/server_hooks.html#create-a-global-server-hook-for-all-repositories for more information." exit 1 -- cgit v1.2.1