From 350a9aa984100a4d91454200fb4ac308108e5cef Mon Sep 17 00:00:00 2001 From: James Lopez Date: Thu, 7 Apr 2016 16:53:15 +0200 Subject: [PATCH] fix create_or_update_import_data --- app/models/project.rb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/models/project.rb b/app/models/project.rb index 273b04c6323..6304699386d 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -419,7 +419,10 @@ class Project < ActiveRecord::Base def create_or_update_import_data(data: nil, credentials: nil) project_import_data = import_data || build_import_data - project_import_data.data = data if data + if data + project_import_data.data ||= {} + project_import_data.data = project_import_data.data.merge(data) + end if credentials project_import_data.credentials ||= {} project_import_data.credentials = project_import_data.credentials.merge(credentials) -- GitLab