diff options
Diffstat (limited to 'ruby/lib')
-rw-r--r-- | ruby/lib/gitlab/git/hook.rb | 4 | ||||
-rw-r--r-- | ruby/lib/gitlab/git/repository.rb | 7 |
2 files changed, 7 insertions, 4 deletions
diff --git a/ruby/lib/gitlab/git/hook.rb b/ruby/lib/gitlab/git/hook.rb index 1b2979cc2..222c93d3b 100644 --- a/ruby/lib/gitlab/git/hook.rb +++ b/ruby/lib/gitlab/git/hook.rb @@ -7,6 +7,10 @@ module Gitlab Gitlab.config.git.hooks_directory end + def self.legacy_hooks_directory + File.join(Gitlab.config.gitlab_shell.path, 'hooks') + end + GL_PROTOCOL = 'web' attr_reader :name, :path, :repository diff --git a/ruby/lib/gitlab/git/repository.rb b/ruby/lib/gitlab/git/repository.rb index 6f4bd9910..1a0b7d044 100644 --- a/ruby/lib/gitlab/git/repository.rb +++ b/ruby/lib/gitlab/git/repository.rb @@ -62,10 +62,9 @@ module Gitlab repo = Rugged::Repository.init_at(repo_path, true) repo.close - # TODO: remove this when self healing hooks has been merged at least - # one release ago: https://gitlab.com/gitlab-org/gitaly/merge_requests/886 - symlink_hooks_to = Gitlab::Git::Hook.directory - create_hooks(repo_path, symlink_hooks_to) if symlink_hooks_to.present? + # TODO: stop symlinking to the old hooks location in or after GitLab 12.0. + # https://gitlab.com/gitlab-org/gitaly/issues/1392 + create_hooks(repo_path, Gitlab::Git::Hook.legacy_hooks_directory) end def create_hooks(repo_path, global_hooks_path) |