Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Lopez <james@jameslopez.es>2016-05-11 12:37:49 +0300
committerJames Lopez <james@jameslopez.es>2016-05-11 12:37:49 +0300
commit68aca6f6635090a33cf4d96c6dbc7ceab6ac2385 (patch)
treec617f3dd3bcba3659d884c34a9d6a70de5111cde /app/controllers/projects/imports_controller.rb
parent1322c981a0aa0752feb16b95e43a1839094a6262 (diff)
trying to fix timing issue with import status
Diffstat (limited to 'app/controllers/projects/imports_controller.rb')
-rw-r--r--app/controllers/projects/imports_controller.rb5
1 files changed, 4 insertions, 1 deletions
diff --git a/app/controllers/projects/imports_controller.rb b/app/controllers/projects/imports_controller.rb
index 7756f0f0ed3..c70b9bf2f5a 100644
--- a/app/controllers/projects/imports_controller.rb
+++ b/app/controllers/projects/imports_controller.rb
@@ -19,7 +19,10 @@ class Projects::ImportsController < Projects::ApplicationController
if @project.import_failed?
@project.import_retry
else
- @project.import_start
+ Project.transaction do
+ @project.import_start
+ end
+ @project.add_import_job if @project.persisted?
end
end