diff options
| author | Robert Speicher <rspeicher@gmail.com> | 2018-12-12 17:27:45 +0000 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2018-12-12 17:27:45 +0000 |
| commit | bfe7f7bdc7b0e5ba19304c218345376684bcbd26 (patch) | |
| tree | c24ba8e4586fa8a0a9d0f5cdd2c76a9cba23e158 /app/models/project.rb | |
| parent | c7ba5c0aeb808f4dc057428a2a98fec7fa1939fb (diff) | |
| parent | 26378511fe11a8bb23d22f4ded9f2b4050d02ed1 (diff) | |
| download | gitlab-ce-bfe7f7bdc7b0e5ba19304c218345376684bcbd26.tar.gz | |
Merge branch 'refactor-create-or-update-import-data' into 'master'
Refactor Project#create_or_update_import_data
See merge request gitlab-org/gitlab-ce!23701
Diffstat (limited to 'app/models/project.rb')
| -rw-r--r-- | app/models/project.rb | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/app/models/project.rb b/app/models/project.rb index 9e65f7bdbca..67262ecce85 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -749,15 +749,9 @@ class Project < ActiveRecord::Base return if data.nil? && credentials.nil? project_import_data = import_data || build_import_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) - end + project_import_data.merge_data(data.to_h) + project_import_data.merge_credentials(credentials.to_h) project_import_data end |