summaryrefslogtreecommitdiff
path: root/changelogs
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-04-01 16:23:21 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2021-04-01 16:23:21 +0000
commita97ccf1330bc0697e05cdac37ffd5597b6fc4eea (patch)
tree69b70aee8fad3942c2c28a5c859945b5f856e59e /changelogs
parentb935f5eb494e4eeb24ea058c03436eae5eb66c6a (diff)
downloadgitlab-ce-a97ccf1330bc0697e05cdac37ffd5597b6fc4eea.tar.gz
Add latest changes from gitlab-org/gitlab@13-10-stable-ee
Diffstat (limited to 'changelogs')
-rw-r--r--changelogs/unreleased/290288-disable-composer-shas-for-v2.yml5
-rw-r--r--changelogs/unreleased/325864-fix-image-blob-rendering.yml5
2 files changed, 0 insertions, 10 deletions
diff --git a/changelogs/unreleased/290288-disable-composer-shas-for-v2.yml b/changelogs/unreleased/290288-disable-composer-shas-for-v2.yml
deleted file mode 100644
index 45838d30160..00000000000
--- a/changelogs/unreleased/290288-disable-composer-shas-for-v2.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Improve performance for composer v2 clients
-merge_request: 55169
-author:
-type: added
diff --git a/changelogs/unreleased/325864-fix-image-blob-rendering.yml b/changelogs/unreleased/325864-fix-image-blob-rendering.yml
deleted file mode 100644
index fa07c4abfc0..00000000000
--- a/changelogs/unreleased/325864-fix-image-blob-rendering.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fixed rendering of the image blobs
-merge_request: 57479
-author:
-type: fixed