From 6689552c4793623a9d47986328a0379ab215f9bc Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Tue, 6 Oct 2020 12:37:40 +0000 Subject: Add latest changes from gitlab-org/gitlab@13-4-stable-ee --- CHANGELOG.md | 9 +++++++++ GITALY_SERVER_VERSION | 2 +- ...reate-wiki-method-on-ensure-wiki-exists-in-update-service.yml | 5 ----- changelogs/unreleased/cat-2fa-404-redirect.yml | 5 ----- changelogs/unreleased/sh-update-fog-azure-rm-gem.yml | 5 ----- 5 files changed, 10 insertions(+), 16 deletions(-) delete mode 100644 changelogs/unreleased/42910-use-create-wiki-method-on-ensure-wiki-exists-in-update-service.yml delete mode 100644 changelogs/unreleased/cat-2fa-404-redirect.yml delete mode 100644 changelogs/unreleased/sh-update-fog-azure-rm-gem.yml diff --git a/CHANGELOG.md b/CHANGELOG.md index 95191fd373d..e81f19271ce 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,15 @@ documentation](doc/development/changelog.md) for instructions on adding your own entry. +## 13.4.3 (2020-10-06) + +### Fixed (3 changes) + +- Exclude 2FA from upload#show routes and 404s. !42784 +- use create_wiki method on ensure_wiki_exists in update_service. !42910 +- Fix large backups not working with Azure Blob storage. !44233 + + ## 13.4.2 (2020-10-01) ### Security (14 changes) diff --git a/GITALY_SERVER_VERSION b/GITALY_SERVER_VERSION index f1017eceacb..7dfdf979eab 100644 --- a/GITALY_SERVER_VERSION +++ b/GITALY_SERVER_VERSION @@ -1 +1 @@ -13.4.2 +13.4.3 \ No newline at end of file diff --git a/changelogs/unreleased/42910-use-create-wiki-method-on-ensure-wiki-exists-in-update-service.yml b/changelogs/unreleased/42910-use-create-wiki-method-on-ensure-wiki-exists-in-update-service.yml deleted file mode 100644 index 02400808f54..00000000000 --- a/changelogs/unreleased/42910-use-create-wiki-method-on-ensure-wiki-exists-in-update-service.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: use create_wiki method on ensure_wiki_exists in update_service -merge_request: 42910 -author: -type: fixed diff --git a/changelogs/unreleased/cat-2fa-404-redirect.yml b/changelogs/unreleased/cat-2fa-404-redirect.yml deleted file mode 100644 index c5d88827295..00000000000 --- a/changelogs/unreleased/cat-2fa-404-redirect.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Exclude 2FA from upload#show routes and 404s -merge_request: 42784 -author: -type: fixed diff --git a/changelogs/unreleased/sh-update-fog-azure-rm-gem.yml b/changelogs/unreleased/sh-update-fog-azure-rm-gem.yml deleted file mode 100644 index 25d143a011b..00000000000 --- a/changelogs/unreleased/sh-update-fog-azure-rm-gem.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Fix large backups not working with Azure Blob storage -merge_request: 44233 -author: -type: fixed -- cgit v1.2.1