diff options
| author | Phil Hughes <me@iamphill.com> | 2017-08-02 16:37:40 +0100 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2017-08-02 16:37:40 +0100 |
| commit | e4c20cd3fe330faa415493ee2fe30dc16fbaca80 (patch) | |
| tree | 0be61b6cc59cf35d81b9271c7603e0d8b203a31c /app/services/projects/import_service.rb | |
| parent | 25d6a6c4b528159c288995de4909e6a8da431d0b (diff) | |
| parent | 88958e5a9cd364ae36f3d2837982cedb9239c3bc (diff) | |
| download | gitlab-ce-sidebar-fly-out-sub-nav.tar.gz | |
Merge branch 'master' into sidebar-fly-out-sub-navsidebar-fly-out-sub-nav
Diffstat (limited to 'app/services/projects/import_service.rb')
| -rw-r--r-- | app/services/projects/import_service.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/services/projects/import_service.rb b/app/services/projects/import_service.rb index eea17e24903..50ec3651515 100644 --- a/app/services/projects/import_service.rb +++ b/app/services/projects/import_service.rb @@ -11,7 +11,7 @@ module Projects success rescue => e - error("Error importing repository #{project.import_url} into #{project.path_with_namespace} - #{e.message}") + error("Error importing repository #{project.import_url} into #{project.full_path} - #{e.message}") end private @@ -51,7 +51,7 @@ module Projects end def clone_repository - gitlab_shell.import_repository(project.repository_storage_path, project.path_with_namespace, project.import_url) + gitlab_shell.import_repository(project.repository_storage_path, project.disk_path, project.import_url) end def fetch_repository |