diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-03 12:09:07 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-03 12:09:07 +0300 |
| commit | 00f4585755bb15ed7ae5bfa32ca5c29112532294 (patch) | |
| tree | 52a10e2bd4dd6807ddfeff6b2264516fe2dd0168 /lib/gitlab/setup_helper.rb | |
| parent | 8bb66ea7e1b00a3b1702e5747ea3a1d332fb11f5 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/setup_helper.rb')
| -rw-r--r-- | lib/gitlab/setup_helper.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/setup_helper.rb b/lib/gitlab/setup_helper.rb index 48f204e0b86..0cf82acb16d 100644 --- a/lib/gitlab/setup_helper.rb +++ b/lib/gitlab/setup_helper.rb @@ -121,7 +121,7 @@ module Gitlab config[:'gitaly-ruby'] = { dir: File.join(gitaly_dir, 'ruby') } if gitaly_ruby config[:'gitlab-shell'] = { dir: Gitlab.config.gitlab_shell.path } - config[:bin_dir] = Gitlab.config.gitaly.client_path + config[:bin_dir] = File.expand_path(Gitlab.config.gitaly.client_path) config[:gitlab] = { url: Gitlab.config.gitlab.url } config[:logging] = { dir: Rails.root.join('log').to_s } |