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:
authorGrzegorz Bizon <grzegorz@gitlab.com>2019-06-25 18:48:39 +0300
committerGrzegorz Bizon <grzegorz@gitlab.com>2019-06-25 18:48:39 +0300
commitd73b6d0f455c4b77dbea7e8b5d5a1574fd665fe0 (patch)
tree949e8a202403d706fa179f32e824befd46d145ab /spec
parentc499c08e516cec7299a475529a5199608722c295 (diff)
parente236fbdb25ee710566d455851238b5ed85b894d7 (diff)
Merge branch 'require-pipeline-when-enabling-only-allow-merge-if-pipeline-succeeds' into 'master'
Pipeline must be present if "Pipeline must succeed" is set See merge request gitlab-org/gitlab-ce!29926
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 fc28c216b21..a2547755510 100644
--- a/spec/models/merge_request_spec.rb
+++ b/spec/models/merge_request_spec.rb
@@ -2124,7 +2124,7 @@ describe MergeRequest do
allow(subject).to receive(:head_pipeline) { nil }
end
- it { expect(subject.mergeable_ci_state?).to be_truthy }
+ it { expect(subject.mergeable_ci_state?).to be_falsey }
end
end