diff options
author | Nick Thomas <nick@gitlab.com> | 2017-08-03 13:19:11 +0100 |
---|---|---|
committer | Nick Thomas <nick@gitlab.com> | 2017-08-07 19:17:11 +0100 |
commit | da5262f4e6d9524b2af2ad8f6c8ebe10edf17169 (patch) | |
tree | a26da5b83832daea538b1a927403fc66422b8c48 /app/models | |
parent | bfac6ce6e4a2415b76db1cd7321e312457c7ee89 (diff) | |
download | gitlab-ce-da5262f4e6d9524b2af2ad8f6c8ebe10edf17169.tar.gz |
Backport changes in https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2551 to CE
Diffstat (limited to 'app/models')
-rw-r--r-- | app/models/project.rb | 5 | ||||
-rw-r--r-- | app/models/project_import_data.rb | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/app/models/project.rb b/app/models/project.rb index 09b1305739c..36b5d644ca3 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -163,7 +163,7 @@ class Project < ActiveRecord::Base has_many :todos has_many :notification_settings, as: :source, dependent: :delete_all # rubocop:disable Cop/ActiveRecordDependent - has_one :import_data, class_name: 'ProjectImportData' + has_one :import_data, class_name: 'ProjectImportData', inverse_of: :project, autosave: true has_one :project_feature has_one :statistics, class_name: 'ProjectStatistics' @@ -192,6 +192,7 @@ class Project < ActiveRecord::Base accepts_nested_attributes_for :variables, allow_destroy: true accepts_nested_attributes_for :project_feature + accepts_nested_attributes_for :import_data delegate :name, to: :owner, allow_nil: true, prefix: true delegate :count, to: :forks, prefix: true @@ -588,8 +589,6 @@ class Project < ActiveRecord::Base project_import_data.credentials ||= {} project_import_data.credentials = project_import_data.credentials.merge(credentials) end - - project_import_data.save end def import? diff --git a/app/models/project_import_data.rb b/app/models/project_import_data.rb index 37730474324..6da6632f4f2 100644 --- a/app/models/project_import_data.rb +++ b/app/models/project_import_data.rb @@ -1,7 +1,7 @@ require 'carrierwave/orm/activerecord' class ProjectImportData < ActiveRecord::Base - belongs_to :project + belongs_to :project, inverse_of: :import_data attr_encrypted :credentials, key: Gitlab::Application.secrets.db_key_base, marshal: true, |