Merge branch 'make-custom-hook-dir-configurable' into 'master' v4.1.0

Make custom hook dir configurable

Add a new configuration option, custom_hook_dir. When this is set, we
will look for global custom hooks in: `<custom_hook_dir>/{pre-receive,update,post-receive}.d/*`

When this is not set, default to `<ROOT_PATH>/hooks`.

Relates to https://gitlab.com/gitlab-org/omnibus-gitlab/issues/1754 and
gitlab-org/gitlab-ce!8040.

See merge request !113

1 files changed, 7 insertions, 0 deletions

diff --git a/lib/gitlab_config.rb b/lib/gitlab_config.rb
index f8a10cf..a51a32c 100644
--- a/lib/gitlab_config.rb
+++ b/lib/gitlab_config.rb
@@ -19,6 +19,13 @@ class GitlabConfig
     @config['secret_file'] ||= File.join(ROOT_PATH, '.gitlab_shell_secret')
   end
 
+  # Pass a default value because this is called from a repo's context; in which
+  # case, the repo's hooks directory should be the default.
+  #
+  def custom_hooks_dir(default: nil)
+    @config['custom_hooks_dir'] || default
+  end
+
   def gitlab_url
     (@config['gitlab_url'] ||= "http://localhost:8080").sub(%r{/*$}, '')
   end