diff options
| author | Grzegorz Bizon <grzegorz@gitlab.com> | 2018-05-08 08:22:39 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2018-05-09 09:58:31 +0100 |
| commit | dcfe8998f85c819081e3a45965ac324d13caac23 (patch) | |
| tree | 626fec8727634c1f106caed633d65bef213b1a79 /app | |
| parent | db23695d18b0406eb1d39ee39ac7269a3a792d93 (diff) | |
| download | gitlab-ce-dcfe8998f85c819081e3a45965ac324d13caac23.tar.gz | |
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
Diffstat (limited to 'app')
| -rw-r--r-- | app/models/project.rb | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/app/models/project.rb b/app/models/project.rb index f6ac1802846..32d34f5e9b8 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -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 |