summaryrefslogtreecommitdiff
path: root/changelogs
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-04-01 15:14:27 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2021-04-01 15:14:27 +0000
commitafbaf78b0d819326741a01b093bdbc4702570417 (patch)
treea16a6f2a8fcc18e60f25ac72df6ab22cfe0eae79 /changelogs
parent38b3003b67db3f2eadfa81fd28b13d168f665766 (diff)
downloadgitlab-ce-afbaf78b0d819326741a01b093bdbc4702570417.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, 10 insertions, 0 deletions
diff --git a/changelogs/unreleased/290288-disable-composer-shas-for-v2.yml b/changelogs/unreleased/290288-disable-composer-shas-for-v2.yml
new file mode 100644
index 00000000000..45838d30160
--- /dev/null
+++ b/changelogs/unreleased/290288-disable-composer-shas-for-v2.yml
@@ -0,0 +1,5 @@
+---
+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
new file mode 100644
index 00000000000..fa07c4abfc0
--- /dev/null
+++ b/changelogs/unreleased/325864-fix-image-blob-rendering.yml
@@ -0,0 +1,5 @@
+---
+title: Fixed rendering of the image blobs
+merge_request: 57479
+author:
+type: fixed