diff options
author | Douwe Maan <douwe@gitlab.com> | 2017-06-06 02:40:53 +0300 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2017-06-06 02:40:53 +0300 |
commit | 94644565971c80c9933ab3d05c534b3b5cbec4d1 (patch) | |
tree | 32d34ca617871e83c5d75d036bc320b25dae0edf /app/controllers | |
parent | 38b3064c25bcf0aff900969d5cddbc3bde1b106a (diff) | |
parent | 810866ecb6c7be4fdac88dc3b2a6cd9ad49ac7bf (diff) |
Merge branch 'pull-mirror-overhaul-ce-backport' into 'master'
backports changed import logic from pull mirroring feature into CE
See merge request !11850
Diffstat (limited to 'app/controllers')
-rw-r--r-- | app/controllers/projects/imports_controller.rb | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/app/controllers/projects/imports_controller.rb b/app/controllers/projects/imports_controller.rb index a1b84afcd91..4b143434ea5 100644 --- a/app/controllers/projects/imports_controller.rb +++ b/app/controllers/projects/imports_controller.rb @@ -14,14 +14,7 @@ class Projects::ImportsController < Projects::ApplicationController @project.import_url = params[:project][:import_url] if @project.save - @project.reload - - if @project.import_failed? - @project.import_retry - else - @project.import_start - @project.add_import_job - end + @project.reload.import_schedule end redirect_to namespace_project_import_path(@project.namespace, @project) |