From 3cc2da362da1884879d700cc9c620437371028e3 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Mon, 16 Mar 2020 18:49:31 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@12-8-stable-ee --- CHANGELOG-EE.md | 7 +++++++ CHANGELOG.md | 7 +++++++ GITALY_SERVER_VERSION | 2 +- changelogs/unreleased/fix-x509-signed-commit.yml | 5 ----- 4 files changed, 15 insertions(+), 6 deletions(-) delete mode 100644 changelogs/unreleased/fix-x509-signed-commit.yml diff --git a/CHANGELOG-EE.md b/CHANGELOG-EE.md index e739c8d3d6d..a2f417a16c6 100644 --- a/CHANGELOG-EE.md +++ b/CHANGELOG-EE.md @@ -1,5 +1,12 @@ Please view this file on the master branch, on stable branches it's out of date. +## 12.8.7 (2020-03-16) + +### Fixed (1 change) + +- Allow multipart uploads for packages. !26387 + + ## 12.8.6 (2020-03-11) - No changes. diff --git a/CHANGELOG.md b/CHANGELOG.md index e95c28605b1..cc6df650d28 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,13 @@ documentation](doc/development/changelog.md) for instructions on adding your own entry. +## 12.8.7 (2020-03-16) + +### Fixed (1 change, 1 of them is from the community) + +- Fix crl_url parsing and certificate visualization. !25876 (Roger Meier) + + ## 12.8.6 (2020-03-11) ### Security (1 change) diff --git a/GITALY_SERVER_VERSION b/GITALY_SERVER_VERSION index 51fbd82b8cc..c9bb023a76e 100644 --- a/GITALY_SERVER_VERSION +++ b/GITALY_SERVER_VERSION @@ -1 +1 @@ -12.8.6 +12.8.7 diff --git a/changelogs/unreleased/fix-x509-signed-commit.yml b/changelogs/unreleased/fix-x509-signed-commit.yml deleted file mode 100644 index d3d0f70ce15..00000000000 --- a/changelogs/unreleased/fix-x509-signed-commit.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Fix crl_url parsing and certificate visualization -merge_request: 25876 -author: Roger Meier -type: fixed -- GitLab