Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/spec
diff options
context:
space:
mode:
authorShinya Maeda <shinya@gitlab.com>2019-04-16 14:56:48 +0300
committerShinya Maeda <shinya@gitlab.com>2019-04-30 19:12:59 +0300
commite51912543c24c2dcf25b2c8d775fc5f57f85e639 (patch)
tree353f3266f1424326f8cbfc417c9ec3b25fd28b7f /spec
parenta96e96d5c8829348fed969d00395be93290577d4 (diff)
Add project level config for merge train
We add the option and expose the parameter for frontend work
Diffstat (limited to 'spec')
-rw-r--r--spec/models/merge_request_spec.rb2
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