summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Lopez <james@jameslopez.es>2016-05-13 13:12:21 +0200
committerJames Lopez <james@jameslopez.es>2016-05-13 13:12:21 +0200
commit8eb67187d04f49f88afc13cdc3d0d591bb1e2a20 (patch)
treecc38ce6289fa6fa91adf4d442ce97af0d2aca765
parent491a312724076f5113766b5fb55f38fee316dd38 (diff)
downloadgitlab-ce-fix/import-data-issue.tar.gz
removed transaction stufffix/import-data-issue
-rw-r--r--app/controllers/projects/imports_controller.rb4
-rw-r--r--app/services/projects/create_service.rb8
2 files changed, 2 insertions, 10 deletions
diff --git a/app/controllers/projects/imports_controller.rb b/app/controllers/projects/imports_controller.rb
index d353a390340..a1b84afcd91 100644
--- a/app/controllers/projects/imports_controller.rb
+++ b/app/controllers/projects/imports_controller.rb
@@ -19,9 +19,7 @@ class Projects::ImportsController < Projects::ApplicationController
if @project.import_failed?
@project.import_retry
else
- Project.transaction do
- @project.import_start
- end
+ @project.import_start
@project.add_import_job
end
end
diff --git a/app/services/projects/create_service.rb b/app/services/projects/create_service.rb
index 2687544ae62..6728fabea1e 100644
--- a/app/services/projects/create_service.rb
+++ b/app/services/projects/create_service.rb
@@ -52,7 +52,7 @@ module Projects
save_project_and_import_data(import_data)
- start_import if @project.import?
+ @project.import_start if @project.import?
after_create_actions if @project.persisted?
@@ -94,12 +94,6 @@ module Projects
end
end
- def start_import
- Project.transaction do
- @project.import_start
- end
- end
-
def save_project_and_import_data(import_data)
Project.transaction do
@project.create_or_update_import_data(data: import_data[:data], credentials: import_data[:credentials]) if import_data