summaryrefslogtreecommitdiff
path: root/app/controllers
diff options
context:
space:
mode:
authorTiago Botelho <tiagonbotelho@hotmail.com>2017-06-01 15:27:35 +0100
committerTiago Botelho <tiagonbotelho@hotmail.com>2017-06-05 23:09:10 +0100
commit810866ecb6c7be4fdac88dc3b2a6cd9ad49ac7bf (patch)
tree20c8292a1527918b71b2c099e6c49598e65d8598 /app/controllers
parentf07aee72bef4604312e11a43fce3a47865bce100 (diff)
downloadgitlab-ce-810866ecb6c7be4fdac88dc3b2a6cd9ad49ac7bf.tar.gz
backports changed import logic from pull mirroring feature into CE
Diffstat (limited to 'app/controllers')
-rw-r--r--app/controllers/projects/imports_controller.rb9
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)