diff options
| author | Sean McGivern <sean@gitlab.com> | 2017-07-07 15:09:29 +0100 |
|---|---|---|
| committer | Sean McGivern <sean@gitlab.com> | 2017-07-07 15:34:33 +0100 |
| commit | 4209b647f87d99b21aebcc9f311e8214c2658136 (patch) | |
| tree | 994064741174944171682117411052716c9bd0ff /changelogs | |
| parent | d40445e4c9964ae0ab793bfdd7ba530de4259716 (diff) | |
| download | gitlab-ce-4209b647f87d99b21aebcc9f311e8214c2658136.tar.gz | |
Don't mark empty MRs as merged on push to the target branchfix-mrs-merged-immediately
When we push to an MR's target branch, we check if the MR's HEAD commit is
contained in the push. This lets us mark MRs as merged if they were merged
manually.
However, we also added a feature where you can create an empty MR from an
issue. If that MR is created around the time of a merge to the default branch,
we would process the push after creating the MR, and consider it to be a manual
merge.
To fix that, we exclude empty MRs from this process. If they are empty, they
were empty before the push we're processing, so we shouldn't touch them!
Diffstat (limited to 'changelogs')
| -rw-r--r-- | changelogs/unreleased/fix-mrs-merged-immediately.yml | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/changelogs/unreleased/fix-mrs-merged-immediately.yml b/changelogs/unreleased/fix-mrs-merged-immediately.yml new file mode 100644 index 00000000000..41c06614e6d --- /dev/null +++ b/changelogs/unreleased/fix-mrs-merged-immediately.yml @@ -0,0 +1,4 @@ +--- +title: Don't mark empty MRs as merged on push to the target branch +merge_request: +author: |