From 0ce33bd2eaa8fe22ad59d7c198bb700f80503db9 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Thu, 21 Jan 2021 15:00:14 +0000 Subject: Add latest changes from gitlab-org/gitlab@13-8-stable-ee --- changelogs/unreleased/sh-disable-rebase-on-conflicts.yml | 5 ----- 1 file changed, 5 deletions(-) delete mode 100644 changelogs/unreleased/sh-disable-rebase-on-conflicts.yml (limited to 'changelogs/unreleased/sh-disable-rebase-on-conflicts.yml') diff --git a/changelogs/unreleased/sh-disable-rebase-on-conflicts.yml b/changelogs/unreleased/sh-disable-rebase-on-conflicts.yml deleted file mode 100644 index c0514929d2a..00000000000 --- a/changelogs/unreleased/sh-disable-rebase-on-conflicts.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Prevent rebase from being run in quick action when there are conflicts -merge_request: 51243 -author: -type: fixed -- cgit v1.2.3