diff options
| author | Grzegorz Bizon <grzegorz@gitlab.com> | 2018-12-11 08:58:46 +0000 |
|---|---|---|
| committer | GitLab Release Tools Bot <robert+release-tools@gitlab.com> | 2018-12-11 19:50:18 +0000 |
| commit | 5637c566f97f9afa697e95beddfbf7fc32f8ed0a (patch) | |
| tree | 80826f1ddc330e3dab99a502e771942ba31133d8 | |
| parent | 8e245c303bf86de9704248c7daed8f306fd5c1c7 (diff) | |
| download | gitlab-ce-5637c566f97f9afa697e95beddfbf7fc32f8ed0a.tar.gz | |
Merge branch 'sh-revert-mr-22911' into 'master'
Revert "Merge branch '28682-can-merge-branch-before-build-is-started' into 'master'"
See merge request gitlab-org/gitlab-ce!23715
(cherry picked from commit 85f430cb3cde4ff8c4d24c1b2a426670e38dd44f)
1bd7f7cb Revert "Merge branch '28682-can-merge-branch-before-build-is-started' into 'master'"
| -rw-r--r-- | app/models/merge_request.rb | 1 | ||||
| -rw-r--r-- | changelogs/unreleased/28682-can-merge-branch-before-build-is-started.yml | 5 | ||||
| -rw-r--r-- | spec/models/merge_request_spec.rb | 2 |
3 files changed, 2 insertions, 6 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index 861211ffc0a..77e48ce11e8 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -978,6 +978,7 @@ class MergeRequest < ActiveRecord::Base def mergeable_ci_state? return true unless project.only_allow_merge_if_pipeline_succeeds? + return true unless head_pipeline actual_head_pipeline&.success? || actual_head_pipeline&.skipped? end diff --git a/changelogs/unreleased/28682-can-merge-branch-before-build-is-started.yml b/changelogs/unreleased/28682-can-merge-branch-before-build-is-started.yml deleted file mode 100644 index 5ffd93e098f..00000000000 --- a/changelogs/unreleased/28682-can-merge-branch-before-build-is-started.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Strictly require a pipeline to merge. -merge_request: 22911 -author: -type: changed 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 |