diff options
author | Jacob Vosmaer <jacob@gitlab.com> | 2019-03-14 20:03:02 +0300 |
---|---|---|
committer | Paul Okstad <pokstad@gitlab.com> | 2019-03-14 20:03:02 +0300 |
commit | 49c66f0eaa1410dc0ae6d6687d1ea1baecfd6aa4 (patch) | |
tree | 53087cf8b6c04f6004308ee127d94027f2e5f2c0 /ruby/lib/gitlab/git/repository.rb | |
parent | 3332ebac578e042257036dab1c96aa1463082e75 (diff) |
Revert "Revert "Merge branch 'switch-to-embedded-hooks' into 'master'""
This reverts commit 4f376cf16e64a0fa673821c0eb4a56eca9ca9419.
Diffstat (limited to 'ruby/lib/gitlab/git/repository.rb')
-rw-r--r-- | ruby/lib/gitlab/git/repository.rb | 7 |
1 files changed, 3 insertions, 4 deletions
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) |