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/project_import_data.rb | |
| 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/project_import_data.rb')
| -rw-r--r-- | app/models/project_import_data.rb | 2 |
1 files changed, 1 insertions, 1 deletions
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, |