summaryrefslogtreecommitdiff
path: root/changelogs/unreleased
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-10-15 15:53:56 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-10-15 15:53:56 +0000
commite7d9e8b4224ce4b22bfd14321d5315ef7680662d (patch)
treece95b567ebcc361507b1368708d00a96d6ab6ffe /changelogs/unreleased
parent02e57d8bf1f21bd874b88121da8323cb97e2c668 (diff)
downloadgitlab-ce-13.4.4.tar.gz
Add latest changes from gitlab-org/gitlab@13-4-stable-eev13.4.4
Diffstat (limited to 'changelogs/unreleased')
-rw-r--r--changelogs/unreleased/patch-migration.yml5
-rw-r--r--changelogs/unreleased/revert-42465-and-42343.yml5
-rw-r--r--changelogs/unreleased/sh-improve-pre-receive-error-ff-merge-message.yml5
3 files changed, 0 insertions, 15 deletions
diff --git a/changelogs/unreleased/patch-migration.yml b/changelogs/unreleased/patch-migration.yml
deleted file mode 100644
index 6335c041a5a..00000000000
--- a/changelogs/unreleased/patch-migration.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix rollback portion of migration that adds temporary index for container scanning findings
-merge_request: 44593
-author:
-type: fixed
diff --git a/changelogs/unreleased/revert-42465-and-42343.yml b/changelogs/unreleased/revert-42465-and-42343.yml
deleted file mode 100644
index 4c7342c9d0d..00000000000
--- a/changelogs/unreleased/revert-42465-and-42343.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: 'Revert 42465 and 42343: Expanded collapsed diff files'
-merge_request: 43361
-author:
-type: other
diff --git a/changelogs/unreleased/sh-improve-pre-receive-error-ff-merge-message.yml b/changelogs/unreleased/sh-improve-pre-receive-error-ff-merge-message.yml
deleted file mode 100644
index af77bfcc41c..00000000000
--- a/changelogs/unreleased/sh-improve-pre-receive-error-ff-merge-message.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Improve merge error when pre-receive hooks fail in fast-forward merge
-merge_request: 44843
-author:
-type: fixed