diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-05 11:54:33 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-05 11:54:33 +0300 |
| commit | 02529530a3dd71b017421bfc33ee2cc31c346ec8 (patch) | |
| tree | e89a15497309627831f40aafd10780916a392f49 | |
| parent | 6bf952d0abaccdbab1d1359e8fd26220c6080b90 (diff) | |
Add latest changes from gitlab-org/gitlab@13-8-stable-eev13.8.3
| -rw-r--r-- | CHANGELOG.md | 8 | ||||
| -rw-r--r-- | GITALY_SERVER_VERSION | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/fj-fix-regression-old-uploads.yml | 5 | ||||
| -rw-r--r-- | changelogs/unreleased/sh-revert-multipart-upload-optimization.yml | 5 |
4 files changed, 9 insertions, 11 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 72177fdb5d4..cf92f4b7651 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,14 @@ documentation](doc/development/changelog.md) for instructions on adding your own entry. +## 13.8.3 (2021-02-05) + +### Fixed (2 changes) + +- Revert multipart URL optimization for AWS S3. !52561 +- Fix regression with old wiki image uploads. !52656 + + ## 13.8.2 (2021-02-01) ### Security (5 changes) diff --git a/GITALY_SERVER_VERSION b/GITALY_SERVER_VERSION index f65295bad83..32d894f3e94 100644 --- a/GITALY_SERVER_VERSION +++ b/GITALY_SERVER_VERSION @@ -1 +1 @@ -13.8.2
\ No newline at end of file +13.8.3
\ No newline at end of file diff --git a/changelogs/unreleased/fj-fix-regression-old-uploads.yml b/changelogs/unreleased/fj-fix-regression-old-uploads.yml deleted file mode 100644 index 5e2cc5fcf9d..00000000000 --- a/changelogs/unreleased/fj-fix-regression-old-uploads.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -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 deleted file mode 100644 index ff3fa4f8919..00000000000 --- a/changelogs/unreleased/sh-revert-multipart-upload-optimization.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Revert multipart URL optimization for AWS S3 -merge_request: 52561 -author: -type: fixed |