diff options
| author | Gabriel Mazetto <brodock@gmail.com> | 2017-07-21 06:13:26 +0200 |
|---|---|---|
| committer | Gabriel Mazetto <brodock@gmail.com> | 2017-08-01 07:26:58 +0200 |
| commit | c6dee99803da69af967ef6db2ad84b6fed9ea542 (patch) | |
| tree | f686015939c6243545a181228950ac3c3feab54e /lib | |
| parent | abb878326c5cac283fff19716149211658ce25d1 (diff) | |
| download | gitlab-ce-c6dee99803da69af967ef6db2ad84b6fed9ea542.tar.gz | |
Rename path_with_namespace -> disk_path when dealing with the filesystem
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/backup/repository.rb | 4 | ||||
| -rw-r--r-- | lib/gitlab/import_export/repo_restorer.rb | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/backup/repository.rb b/lib/backup/repository.rb index f8cb8f089e7..8d56b74bfd6 100644 --- a/lib/backup/repository.rb +++ b/lib/backup/repository.rb @@ -142,11 +142,11 @@ module Backup end def path_to_bundle(project) - File.join(backup_repos_path, project.path_with_namespace + '.bundle') + File.join(backup_repos_path, project.disk_path + '.bundle') end def path_to_tars(project, dir = nil) - path = File.join(backup_repos_path, project.path_with_namespace) + path = File.join(backup_repos_path, project.disk_path) if dir File.join(path, "#{dir}.tar") diff --git a/lib/gitlab/import_export/repo_restorer.rb b/lib/gitlab/import_export/repo_restorer.rb index c824d3ea9fc..32ca2809b2f 100644 --- a/lib/gitlab/import_export/repo_restorer.rb +++ b/lib/gitlab/import_export/repo_restorer.rb @@ -13,7 +13,7 @@ module Gitlab def restore return true unless File.exist?(@path_to_bundle) - gitlab_shell.import_repository(@project.repository_storage_path, @project.path_with_namespace, @path_to_bundle) + gitlab_shell.import_repository(@project.repository_storage_path, @project.disk_path, @path_to_bundle) rescue => e @shared.error(e) false |