diff options
author | Alejandro RodrÃguez <alejorro70@gmail.com> | 2016-07-26 17:22:13 -0400 |
---|---|---|
committer | Alejandro RodrÃguez <alejorro70@gmail.com> | 2016-07-26 17:22:13 -0400 |
commit | 1dcfb1d3a7b6b8002b1f25e8cf463617acbc1299 (patch) | |
tree | 617ebc3e0e06e2001a6f34cadc448366ceebda9f /app/workers/repository_fork_worker.rb | |
parent | 0c799be6b6fc0166473c82039ebf662a0558ed8f (diff) | |
download | gitlab-ce-1dcfb1d3a7b6b8002b1f25e8cf463617acbc1299.tar.gz |
Fix a bug where forking a project from a repository storage to another would fail20302-forking-a-project-from-one-storage-to-another-fails
Diffstat (limited to 'app/workers/repository_fork_worker.rb')
-rw-r--r-- | app/workers/repository_fork_worker.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/app/workers/repository_fork_worker.rb b/app/workers/repository_fork_worker.rb index f7604e48f83..d69d6037053 100644 --- a/app/workers/repository_fork_worker.rb +++ b/app/workers/repository_fork_worker.rb @@ -4,7 +4,7 @@ class RepositoryForkWorker sidekiq_options queue: :gitlab_shell - def perform(project_id, source_path, target_path) + def perform(project_id, forked_from_repository_storage_path, source_path, target_path) project = Project.find_by_id(project_id) unless project.present? @@ -12,7 +12,8 @@ class RepositoryForkWorker return end - result = gitlab_shell.fork_repository(project.repository_storage_path, source_path, target_path) + result = gitlab_shell.fork_repository(forked_from_repository_storage_path, source_path, + project.repository_storage_path, target_path) unless result logger.error("Unable to fork project #{project_id} for repository #{source_path} -> #{target_path}") project.mark_import_as_failed('The project could not be forked.') |