diff options
| author | Tiago Botelho <tiagonbotelho@hotmail.com> | 2018-11-27 09:41:27 +0000 |
|---|---|---|
| committer | Tiago Botelho <tiagonbotelho@hotmail.com> | 2018-11-27 12:58:13 +0000 |
| commit | 4bd8a427d4e8127f1badc7365b35702472918956 (patch) | |
| tree | d8e64bd046f35b64ad6f88bdd062e1e8f364c327 /app/workers/repository_fork_worker.rb | |
| parent | d3f033d69cec33e8058ee9f029718882990175b0 (diff) | |
| download | gitlab-ce-4bd8a427d4e8127f1badc7365b35702472918956.tar.gz | |
Removes all the irrelevant import related code and columns
Clears the import related columns and code from the Project
model over to the ProjectImportState model
Diffstat (limited to 'app/workers/repository_fork_worker.rb')
| -rw-r--r-- | app/workers/repository_fork_worker.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/workers/repository_fork_worker.rb b/app/workers/repository_fork_worker.rb index 68ec66e8499..7eae07d3f6b 100644 --- a/app/workers/repository_fork_worker.rb +++ b/app/workers/repository_fork_worker.rb @@ -12,7 +12,7 @@ class RepositoryForkWorker source_project = target_project.forked_from_project unless source_project - return target_project.mark_import_as_failed('Source project cannot be found.') + return target_project.import_state.mark_as_failed(_('Source project cannot be found.')) end fork_repository(target_project, source_project.repository_storage, source_project.disk_path) @@ -33,7 +33,7 @@ class RepositoryForkWorker end def start_fork(project) - return true if start(project) + return true if start(project.import_state) Rails.logger.info("Project #{project.full_path} was in inconsistent state (#{project.import_status}) while forking.") false |