diff options
| author | Rémy Coutable <remy@rymai.me> | 2019-04-10 12:03:37 +0200 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2019-04-10 15:56:46 +0200 |
| commit | 22c1c9805b00ebc3bbb48fabba49cf2ba3e696e0 (patch) | |
| tree | 642b04ecba8c0880ae8b36c99c95280ac9ff011f /app/services/projects/create_service.rb | |
| parent | 6c8a13da33e5ff11210122f7863d36f989b99630 (diff) | |
| download | gitlab-ce-22c1c9805b00ebc3bbb48fabba49cf2ba3e696e0.tar.gz | |
Fix ApplicationSetting development seed60278-fix-development-seed
It could happen that there's a cached (in Redis) ApplicationSetting
record, and calling
`Gitlab::CurrentSettings.current_application_settings` only returns it
instead of creating a new DB record, which makes the
`ApplicationSetting.current_without_cache.update!` call fail.
Signed-off-by: Rémy Coutable <remy@rymai.me>
Diffstat (limited to 'app/services/projects/create_service.rb')
| -rw-r--r-- | app/services/projects/create_service.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/services/projects/create_service.rb b/app/services/projects/create_service.rb index 3723c5ef7d7..4ea40e3c8ce 100644 --- a/app/services/projects/create_service.rb +++ b/app/services/projects/create_service.rb @@ -159,8 +159,8 @@ module Projects log_message << " Project ID: #{@project.id}" if @project&.id Rails.logger.error(log_message) - if @project - @project.import_state.mark_as_failed(message) if @project.persisted? && @project.import? + if @project && @project.persisted? && @project.import_state + @project.import_state.mark_as_failed(message) end @project |