kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

more changes based on MR feedback

This commit is contained in:
James Lopez 2016-05-12 18:27:20 +02:00
parent f27d7b2c64
commit cacbecd05c
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/projects/imports_controller.rb
View File

@ -22,7 +22,7 @@ class Projects::ImportsController < Projects::ApplicationController
Project.transaction do Project.transaction do
@project.import_start @project.import_start
end end
@project.add_import_job if @project.persisted? @project.add_import_job
end end
end end

3
app/services/projects/create_service.rb
View File

@ -103,9 +103,8 @@ module Projects
def save_project_and_import_data(import_data) def save_project_and_import_data(import_data)
Project.transaction do Project.transaction do
@project.create_or_update_import_data(data: import_data[:data], credentials: import_data[:credentials]) if import_data @project.create_or_update_import_data(data: import_data[:data], credentials: import_data[:credentials]) if import_data
@project.save
if @project.persisted? && !@project.import? if @project.save && !@project.import?
raise 'Failed to create repository' unless @project.create_repository raise 'Failed to create repository' unless @project.create_repository
end end
end end