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

Merge branch 'dm-ensure-import-state-persisted' into 'master'

Browse source 
Don't create import_state until project is persisted

See merge request gitlab-org/gitlab-ce!18803
This commit is contained in:
Grzegorz Bizon 2018-05-08 08:22:39 +00:00
commit 7dddff1ed5
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/models/project.rb
View file

@ -661,9 +661,15 @@ class Project < ActiveRecord::Base
return if !force && (self[:import_status] == 'none' || self[:import_status].nil?)
return unless import_state.nil?
create_import_state(import_state_args)
if persisted?
create_import_state(import_state_args)
update_column(:import_status, 'none')
update_column(:import_status, 'none')
else
build_import_state(import_state_args)
self[:import_status] = 'none'
end
end
def import_schedule