summaryrefslogtreecommitdiff
path: root/changelogs
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-02-04 17:42:58 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2021-02-04 17:42:58 +0000
commit7114ad8ea2418f8fdc4741c8b7f5b551bcc467a7 (patch)
tree589d36c0e93fddcea736dd6cb085a89252c6501a /changelogs
parent0b4b96be1f12bf2a0b9b561daba716e0468a9e61 (diff)
downloadgitlab-ce-7114ad8ea2418f8fdc4741c8b7f5b551bcc467a7.tar.gz
Add latest changes from gitlab-org/gitlab@13-8-stable-ee
Diffstat (limited to 'changelogs')
-rw-r--r--changelogs/unreleased/fj-fix-regression-old-uploads.yml5
-rw-r--r--changelogs/unreleased/sh-revert-multipart-upload-optimization.yml5
2 files changed, 10 insertions, 0 deletions
diff --git a/changelogs/unreleased/fj-fix-regression-old-uploads.yml b/changelogs/unreleased/fj-fix-regression-old-uploads.yml
new file mode 100644
index 00000000000..5e2cc5fcf9d
--- /dev/null
+++ b/changelogs/unreleased/fj-fix-regression-old-uploads.yml
@@ -0,0 +1,5 @@
+---
+title: Fix regression with old wiki image uploads
+merge_request: 52656
+author:
+type: fixed
diff --git a/changelogs/unreleased/sh-revert-multipart-upload-optimization.yml b/changelogs/unreleased/sh-revert-multipart-upload-optimization.yml
new file mode 100644
index 00000000000..ff3fa4f8919
--- /dev/null
+++ b/changelogs/unreleased/sh-revert-multipart-upload-optimization.yml
@@ -0,0 +1,5 @@
+---
+title: Revert multipart URL optimization for AWS S3
+merge_request: 52561
+author:
+type: fixed