diff options
author | Jacob Vosmaer <jacob@gitlab.com> | 2019-02-27 13:58:21 +0300 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2019-02-27 13:58:21 +0300 |
commit | 078f11a6b9c0197a3cfde6b3658ca268097e315c (patch) | |
tree | a2253cf873eb585e2a2812ff584cd2e748ed6e02 /config/initializers/1_settings.rb | |
parent | 1b10b77babf008daf337ff194f10508935a8c8a2 (diff) |
Prepare test suite for switch to Gitaly-embedded Git hooks
Diffstat (limited to 'config/initializers/1_settings.rb')
-rw-r--r-- | config/initializers/1_settings.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb index dfcf1e648b4..1344b3cb1f6 100644 --- a/config/initializers/1_settings.rb +++ b/config/initializers/1_settings.rb @@ -337,7 +337,7 @@ Settings['sidekiq']['log_format'] ||= 'default' # Settings['gitlab_shell'] ||= Settingslogic.new({}) Settings.gitlab_shell['path'] = Settings.absolute(Settings.gitlab_shell['path'] || Settings.gitlab['user_home'] + '/gitlab-shell/') -Settings.gitlab_shell['hooks_path'] = Settings.absolute(Settings.gitlab_shell['hooks_path'] || Settings.gitlab['user_home'] + '/gitlab-shell/hooks/') +Settings.gitlab_shell['hooks_path'] = :deprecated_use_gitlab_shell_path_instead Settings.gitlab_shell['secret_file'] ||= Rails.root.join('.gitlab_shell_secret') Settings.gitlab_shell['receive_pack'] = true if Settings.gitlab_shell['receive_pack'].nil? Settings.gitlab_shell['upload_pack'] = true if Settings.gitlab_shell['upload_pack'].nil? |