diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-06 12:37:40 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-06 12:37:40 +0000 |
| commit | 6689552c4793623a9d47986328a0379ab215f9bc (patch) | |
| tree | 8d8995ea8d7d6ba67bce73b953f891400bb0cfe5 | |
| parent | cf07732e07ca2f1ff76a5900b7d14f389bfe9770 (diff) | |
| download | gitlab-ce-6689552c4793623a9d47986328a0379ab215f9bc.tar.gz | |
Add latest changes from gitlab-org/gitlab@13-4-stable-eev13.4.3
| -rw-r--r-- | CHANGELOG.md | 9 | ||||
| -rw-r--r-- | GITALY_SERVER_VERSION | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/42910-use-create-wiki-method-on-ensure-wiki-exists-in-update-service.yml | 5 | ||||
| -rw-r--r-- | changelogs/unreleased/cat-2fa-404-redirect.yml | 5 | ||||
| -rw-r--r-- | changelogs/unreleased/sh-update-fog-azure-rm-gem.yml | 5 |
5 files changed, 10 insertions, 16 deletions
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 |