From c97c8073a0e63b678c31ebba78ca2867db376c76 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Wed, 23 Dec 2020 15:50:49 +0000 Subject: Add latest changes from gitlab-org/gitlab@13-7-stable-ee --- CHANGELOG.md | 7 +++++++ GITALY_SERVER_VERSION | 2 +- changelogs/unreleased/ak-fix-project-transfer-2.yml | 5 ----- 3 files changed, 8 insertions(+), 6 deletions(-) delete mode 100644 changelogs/unreleased/ak-fix-project-transfer-2.yml diff --git a/CHANGELOG.md b/CHANGELOG.md index 9d3ce7e8665..fe4775033e1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,13 @@ documentation](doc/development/changelog.md) for instructions on adding your own entry. +## 13.7.1 (2020-12-23) + +### Fixed (1 change) + +- Fix project transfer corrupting shared runners state. !47316 + + ## 13.7.0 (2020-12-22) ### Security (1 change) diff --git a/GITALY_SERVER_VERSION b/GITALY_SERVER_VERSION index 506ade15ecf..5d6328a378c 100644 --- a/GITALY_SERVER_VERSION +++ b/GITALY_SERVER_VERSION @@ -1 +1 @@ -13.7.0 \ No newline at end of file +13.7.1 \ No newline at end of file diff --git a/changelogs/unreleased/ak-fix-project-transfer-2.yml b/changelogs/unreleased/ak-fix-project-transfer-2.yml deleted file mode 100644 index f75e498bbc5..00000000000 --- a/changelogs/unreleased/ak-fix-project-transfer-2.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Fix project transfer corrupting shared runners state -merge_request: 47316 -author: -type: fixed -- cgit v1.2.3