From ab2382923e7a864a3fa27fdf8eeb9b21893b9147 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Mon, 7 Oct 2019 09:05:55 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- changelogs/unreleased/16388-abort-mwps-on-impossible-ff-merge.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 changelogs/unreleased/16388-abort-mwps-on-impossible-ff-merge.yml (limited to 'changelogs') 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 -- cgit v1.2.3