trying to fix timing issue with import status

3 files changed, 8 insertions, 8 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
 
diff --git a/app/models/project.rb b/app/models/project.rb
index 05e14185a3e..d807802ce1c 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -246,7 +246,6 @@ class Project < ActiveRecord::Base
     state :finished
     state :failed
 
-    after_transition any => :started, do: :schedule_add_import_job
     after_transition any => :finished, do: :clear_import_data
   end
 
@@ -385,10 +384,6 @@ class Project < ActiveRecord::Base
     id && persisted?
   end
 
-  def schedule_add_import_job
-    run_after_commit(:add_import_job)
-  end
-
   def add_import_job
     if forked?
       job_id = RepositoryForkWorker.perform_async(self.id, forked_from_project.path_with_namespace, self.namespace.path)
diff --git a/app/services/projects/create_service.rb b/app/services/projects/create_service.rb
index a77652480b2..53a16e95f5b 100644
--- a/app/services/projects/create_service.rb
+++ b/app/services/projects/create_service.rb
@@ -59,6 +59,10 @@ module Projects
         end
       end
 
+      Project.transaction do
+        @project.import_start if @project.import?
+      end
+
       after_create_actions if @project.persisted?
 
       @project
@@ -95,8 +99,6 @@ module Projects
       unless @project.group
         @project.team << [current_user, :master, current_user]
       end
-
-      @project.import_start if @project.import?
     end
   end
 end