diff options
| author | Douwe Maan <douwe@selenight.nl> | 2018-05-08 09:46:29 +0200 |
|---|---|---|
| committer | Douwe Maan <douwe@selenight.nl> | 2018-05-08 09:47:37 +0200 |
| commit | 1bd5896cd06e26130077632a4ac2d5cabd7be7d0 (patch) | |
| tree | f24995a729f541746a59cc63a44b33c4b718a319 | |
| parent | 0eb74426b3eeacf92cd144e6ddc336adbe43ca1e (diff) | |
| download | gitlab-ce-1bd5896cd06e26130077632a4ac2d5cabd7be7d0.tar.gz | |
Don't create import_state until project is persisted
| -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 |