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

refactor project create service

Browse source
This commit is contained in:
James Lopez 2018-01-03 16:17:16 +01:00
parent 80112ca4ec
commit 86257cf713
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/models/project.rb
View file

@ -639,7 +639,7 @@ class Project < ActiveRecord::Base
end end
def import? def import?
external_import? || forked? || gitlab_project_import? external_import? || forked? || gitlab_project_import? || bare_repository_import?
end end
def no_import? def no_import?

4
app/services/projects/create_service.rb
View file

@ -120,7 +120,7 @@ module Projects
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
if @project.save && !@project.import? && !@project.bare_repository_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
@ -165,7 +165,7 @@ module Projects
def import_schedule def import_schedule
if @project.errors.empty? if @project.errors.empty?
@project.import_schedule if @project.import? @project.import_schedule if @project.import? && !@project.bare_repository_import?
else else
fail(error: @project.errors.full_messages.join(', ')) fail(error: @project.errors.full_messages.join(', '))
end end