diff options
| author | Grzegorz Bizon <grzegorz@gitlab.com> | 2018-11-16 13:26:07 +0300 |
|---|---|---|
| committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2018-11-16 13:26:07 +0300 |
| commit | 793be43b35bc8cd2a9effe38280417ee198647cb (patch) | |
| tree | 3faf5499f4769e719c881dfa6d28e74d9d0a0ec8 /spec/models | |
| parent | 8d0b4872ba3ff787c4067618f48b60bd24466c74 (diff) | |
| parent | bfd53b7b791e430c730557ef6f8d2563159c24df (diff) | |
Merge branch '28682-can-merge-branch-before-build-is-started' into 'master'
Resolve "Can merge branch before build is started"
Closes #28682
See merge request gitlab-org/gitlab-ce!22911
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 131db6a5ff9..a58dc8e25e8 100644 --- a/spec/models/merge_request_spec.rb +++ b/spec/models/merge_request_spec.rb @@ -1782,7 +1782,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 |