Commit dcfe8998 authored by Grzegorz Bizon's avatar Grzegorz Bizon 🌴 Committed by Filipa Lacerda

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

Don't create import_state until project is persisted

See merge request gitlab-org/gitlab-ce!18803
parent db23695d
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment