diff options
Diffstat (limited to 'internal/git/hooks/hooks.go')
| -rw-r--r-- | internal/git/hooks/hooks.go | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/internal/git/hooks/hooks.go b/internal/git/hooks/hooks.go index 9357f0fe5..d7df23a8a 100644 --- a/internal/git/hooks/hooks.go +++ b/internal/git/hooks/hooks.go @@ -1,7 +1,6 @@ package hooks import ( - "os" "path" "gitlab.com/gitlab-org/gitaly/internal/config" @@ -10,18 +9,11 @@ import ( // Override allows tests to control where the hooks directory is. var Override string -// Path returns the path where the global git hooks are located. As a -// transitional mechanism, GITALY_USE_EMBEDDED_HOOKS=1 will cause -// Gitaly's embedded hooks to be used instead of the legacy gitlab-shell -// hooks. +// Path returns the path where the global git hooks are located. func Path() string { if len(Override) > 0 { return Override } - if os.Getenv("GITALY_USE_EMBEDDED_HOOKS") == "1" { - return path.Join(config.Config.Ruby.Dir, "git-hooks") - } - - return path.Join(config.Config.GitlabShell.Dir, "hooks") + return path.Join(config.Config.Ruby.Dir, "git-hooks") } |