diff options
| author | Shinya Maeda <shinya@gitlab.com> | 2019-04-16 18:56:48 +0700 |
|---|---|---|
| committer | Shinya Maeda <shinya@gitlab.com> | 2019-04-30 23:12:59 +0700 |
| commit | e51912543c24c2dcf25b2c8d775fc5f57f85e639 (patch) | |
| tree | 353f3266f1424326f8cbfc417c9ec3b25fd28b7f /spec/models | |
| parent | a96e96d5c8829348fed969d00395be93290577d4 (diff) | |
| download | gitlab-ce-e51912543c24c2dcf25b2c8d775fc5f57f85e639.tar.gz | |
Add project level config for merge trainadd-project-level-config-for-merge-train-ce
We add the option and expose the parameter for frontend work
Diffstat (limited to 'spec/models')
| -rw-r--r-- | spec/models/merge_request_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/models/merge_request_spec.rb b/spec/models/merge_request_spec.rb index f61857ea5ff..06dcc44d35b 100644 --- a/spec/models/merge_request_spec.rb +++ b/spec/models/merge_request_spec.rb @@ -2123,7 +2123,7 @@ describe MergeRequest do end context 'when merges are not restricted to green builds' do - subject { build(:merge_request, target_project: build(:project, only_allow_merge_if_pipeline_succeeds: false)) } + subject { build(:merge_request, target_project: create(:project, only_allow_merge_if_pipeline_succeeds: false)) } context 'and a failed pipeline is associated' do before do |