diff options
| author | Stan Hu <stanhu@gmail.com> | 2018-12-11 08:17:32 +0300 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2018-12-11 08:18:24 +0300 |
| commit | 1bd7f7cb201a246f3376481f7d7ab53f415f843b (patch) | |
| tree | 89bfafe88d266e454366901a7b11754f68528523 /spec/models | |
| parent | 185f8a5da6b4bd6090aa41e5f39ad0381200ee84 (diff) | |
Revert "Merge branch '28682-can-merge-branch-before-build-is-started' into 'master'"
This reverts commit 793be43b35bc8cd2a9effe38280417ee198647cb, reversing
changes made to 8d0b4872ba3ff787c4067618f48b60bd24466c74.
For projects not using any CI, enabling merge only when pipeline succeeds
caused merge requests to be in unmergeable state, which caused significant
confusion.
See https://gitlab.com/gitlab-org/gitlab-ce/issues/55144 for more details.
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 9b60054e14a..c3152d2021b 100644 --- a/spec/models/merge_request_spec.rb +++ b/spec/models/merge_request_spec.rb @@ -1885,7 +1885,7 @@ describe MergeRequest do allow(subject).to receive(:head_pipeline) { nil } end - it { expect(subject.mergeable_ci_state?).to be_falsey } + it { expect(subject.mergeable_ci_state?).to be_truthy } end end |