diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2018-04-04 09:20:19 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2018-04-04 09:20:19 +0000 |
| commit | c353426650877956bf2db3111f9964f68e5940f6 (patch) | |
| tree | 43ba7e90110e742bd14c8c417254e6e104f497f1 /app/services/projects | |
| parent | 9dd330576ac374cd7ec7e97863e0b5228dfd3205 (diff) | |
| parent | ddfc661f794ca02654853a9e223b9a5f3fb983ab (diff) | |
| download | gitlab-ce-c353426650877956bf2db3111f9964f68e5940f6.tar.gz | |
Merge branch 'fix/use-shard-name-in-gitlab-projects-instead-of-shard-path' into 'master'
Use shard name in Git::GitlabProjects instead of shard path
Closes gitaly#1110
See merge request gitlab-org/gitlab-ce!18015
Diffstat (limited to 'app/services/projects')
| -rw-r--r-- | app/services/projects/import_service.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/services/projects/import_service.rb b/app/services/projects/import_service.rb index a3828acc50b..bdd9598f85a 100644 --- a/app/services/projects/import_service.rb +++ b/app/services/projects/import_service.rb @@ -61,7 +61,7 @@ module Projects project.ensure_repository project.repository.fetch_as_mirror(project.import_url, refmap: refmap) else - gitlab_shell.import_repository(project.repository_storage_path, project.disk_path, project.import_url) + gitlab_shell.import_repository(project.repository_storage, project.disk_path, project.import_url) end rescue Gitlab::Shell::Error, Gitlab::Git::RepositoryMirroring::RemoteError => e # Expire cache to prevent scenarios such as: |