diff options
| author | Douwe Maan <douwe@gitlab.com> | 2018-05-04 16:00:39 +0000 |
|---|---|---|
| committer | Mayra Cabrera <mcabrera@gitlab.com> | 2018-05-04 11:09:51 -0500 |
| commit | c8f70158e57213e4a813aef1e3b0ad9aa22441b0 (patch) | |
| tree | 4f1c473361b2751830d417ab8f1116868bfc9e96 /app | |
| parent | d36753ca4448983a4113f8e6fccdbe58d3452ecd (diff) | |
| download | gitlab-ce-c8f70158e57213e4a813aef1e3b0ad9aa22441b0.tar.gz | |
Merge branch '46049-import-export-import-is-broken-due-to-the-addition-of-a-ci-table' into 'master'
Resolve "Import/Export (import) is broken due to the addition of a CI table"
Closes #46049
See merge request gitlab-org/gitlab-ce!18745
Diffstat (limited to 'app')
| -rw-r--r-- | app/models/project.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/project.rb b/app/models/project.rb index d4e9e51c7be..aa5f101a718 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -236,7 +236,7 @@ class Project < ActiveRecord::Base has_many :custom_attributes, class_name: 'ProjectCustomAttribute' has_many :project_badges, class_name: 'ProjectBadge' - has_one :ci_cd_settings, class_name: 'ProjectCiCdSetting' + has_one :ci_cd_settings, class_name: 'ProjectCiCdSetting', inverse_of: :project, autosave: true, dependent: :destroy # rubocop:disable Cop/ActiveRecordDependent accepts_nested_attributes_for :variables, allow_destroy: true accepts_nested_attributes_for :project_feature, update_only: true |