diff options
author | Mayra Cabrera <mcabrera@gitlab.com> | 2018-05-04 20:25:15 +0300 |
---|---|---|
committer | Mayra Cabrera <mcabrera@gitlab.com> | 2018-05-04 20:25:15 +0300 |
commit | fb38c4e6457ae93794879f29ce0bf62dffc2d407 (patch) | |
tree | 4f1c473361b2751830d417ab8f1116868bfc9e96 | |
parent | d36753ca4448983a4113f8e6fccdbe58d3452ecd (diff) | |
parent | c8f70158e57213e4a813aef1e3b0ad9aa22441b0 (diff) |
Merge branch '10-8-stable-prepare-rc2' into '10-8-stable'
Prepare 10.8 RC2 release
See merge request gitlab-org/gitlab-ce!18744
-rw-r--r-- | app/models/project.rb | 2 | ||||
-rw-r--r-- | changelogs/unreleased/46049-import-export-import-is-broken-due-to-the-addition-of-a-ci-table.yml | 5 | ||||
-rw-r--r-- | spec/models/project_spec.rb | 8 |
3 files changed, 14 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 diff --git a/changelogs/unreleased/46049-import-export-import-is-broken-due-to-the-addition-of-a-ci-table.yml b/changelogs/unreleased/46049-import-export-import-is-broken-due-to-the-addition-of-a-ci-table.yml new file mode 100644 index 00000000000..77e4bb50082 --- /dev/null +++ b/changelogs/unreleased/46049-import-export-import-is-broken-due-to-the-addition-of-a-ci-table.yml @@ -0,0 +1,5 @@ +--- +title: Resolve Import/Export ci_cd_settings error updating the project +merge_request: 46049 +author: +type: fixed diff --git a/spec/models/project_spec.rb b/spec/models/project_spec.rb index a9587b1005e..87731f05b7d 100644 --- a/spec/models/project_spec.rb +++ b/spec/models/project_spec.rb @@ -102,6 +102,14 @@ describe Project do end end + context 'updating cd_cd_settings' do + it 'does not raise an error' do + project = create(:project) + + expect { project.update(ci_cd_settings: nil) }.not_to raise_exception + end + end + describe '#members & #requesters' do let(:project) { create(:project, :public, :access_requestable) } let(:requester) { create(:user) } |