Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-10-07 12:05:55 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2019-10-07 12:05:55 +0300
commitab2382923e7a864a3fa27fdf8eeb9b21893b9147 (patch)
tree89a0d33672657f2c793b0966e1d82041f36c76c9 /changelogs
parent3900b8a0062113e11e600e4226426e4163ac5e2c (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'changelogs')
-rw-r--r--changelogs/unreleased/16388-abort-mwps-on-impossible-ff-merge.yml5
1 files changed, 5 insertions, 0 deletions
diff --git a/changelogs/unreleased/16388-abort-mwps-on-impossible-ff-merge.yml b/changelogs/unreleased/16388-abort-mwps-on-impossible-ff-merge.yml
new file mode 100644
index 00000000000..4823c75bf2d
--- /dev/null
+++ b/changelogs/unreleased/16388-abort-mwps-on-impossible-ff-merge.yml
@@ -0,0 +1,5 @@
+---
+title: Abort Merge When Pipeline Succeeds when Fast Forward merge is impossible
+merge_request: 17886
+author:
+type: fixed