summaryrefslogtreecommitdiff
path: root/spec
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2016-01-06 18:58:10 +0000
committerRobert Speicher <robert@gitlab.com>2016-01-06 18:58:10 +0000
commitb93744e3008fd2ba313f62f9e5ad8820e0cc8582 (patch)
treecdd9f62fa483bf5c1c525b13695be1e531a3a862 /spec
parent6865d3e5001805c648ba9fefd594540eff47c7b6 (diff)
parentc0849101e6d79bed12c830986c7ff63b2e2f3d9e (diff)
downloadgitlab-ce-b93744e3008fd2ba313f62f9e5ad8820e0cc8582.tar.gz
Merge branch 'merge-when-build-succeeds-unchecked' into 'master'
Get "Merge when build succeeds" to work when commits were pushed to MR target branch while builds were running The Merge when build succeeds service only merges when the MR is mergeable (open, not WIP, no conflicts). When the target branch is updated, all affected MRs have their merge status set to `unchecked`, and the conflicts check will only happen when `check_if_can_be_merged` is called, which happens when the MR page is viewed. When someone enables the automatic merge, the target branch is updated, no-one views the MR page again, and the build succeeds, the mergeability check will fail and the MR will not in fact be merged. This MR makes sure `check_if_can_be_merged` is always called when MR mergeability is checked. See merge request !2304
Diffstat (limited to 'spec')
0 files changed, 0 insertions, 0 deletions