diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2018-03-23 13:20:45 +0300 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2018-03-23 13:20:45 +0300 |
| commit | bb9d360c0a7daed6aa08a0635e084c314c2c8b3e (patch) | |
| tree | 2320d72d11cf226ff35ccc5f00c9e4cd8af5fee1 /lib/gitlab/shell.rb | |
| parent | 963e445f58f1cbe03f821167a3bf1d0b8cc8a56d (diff) | |
| parent | 008a6a6ce6fa943adcfecf3a606b845cfa282680 (diff) | |
Merge branch 'mark-legacy-git-access' into 'master'
Route path lookups through legacy_disk_path
See merge request gitlab-org/gitlab-ce!17743
Diffstat (limited to 'lib/gitlab/shell.rb')
| -rw-r--r-- | lib/gitlab/shell.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/gitlab/shell.rb b/lib/gitlab/shell.rb index 3a8f5826818..c8c15b9684a 100644 --- a/lib/gitlab/shell.rb +++ b/lib/gitlab/shell.rb @@ -82,7 +82,7 @@ module Gitlab repository.gitaly_repository_client.create_repository true else - repo_path = File.join(Gitlab.config.repositories.storages[storage]['path'], relative_path) + repo_path = File.join(Gitlab.config.repositories.storages[storage].legacy_disk_path, relative_path) Gitlab::Git::Repository.create(repo_path, bare: true, symlink_hooks_to: gitlab_shell_hooks_path) end end @@ -131,7 +131,7 @@ module Gitlab if is_enabled repository.gitaly_repository_client.fetch_remote(remote, ssh_auth: ssh_auth, forced: forced, no_tags: no_tags, timeout: git_timeout, prune: prune) else - storage_path = Gitlab.config.repositories.storages[repository.storage]["path"] + storage_path = Gitlab.config.repositories.storages[repository.storage].legacy_disk_path local_fetch_remote(storage_path, repository.relative_path, remote, ssh_auth: ssh_auth, forced: forced, no_tags: no_tags, prune: prune) end end @@ -478,7 +478,7 @@ module Gitlab def gitaly_namespace_client(storage_path) storage, _value = Gitlab.config.repositories.storages.find do |storage, value| - value['path'] == storage_path + value.legacy_disk_path == storage_path end Gitlab::GitalyClient::NamespaceService.new(storage) |