summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-12-23 15:50:49 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-12-23 15:50:49 +0000
commitc97c8073a0e63b678c31ebba78ca2867db376c76 (patch)
tree0466f6d052f6691e997eb7d23791a4176ba63b38
parente69514a8dc056ff34499c2d6c7a0111993620559 (diff)
downloadgitlab-ce-c97c8073a0e63b678c31ebba78ca2867db376c76.tar.gz
Add latest changes from gitlab-org/gitlab@13-7-stable-eev13.7.1
-rw-r--r--CHANGELOG.md7
-rw-r--r--GITALY_SERVER_VERSION2
-rw-r--r--changelogs/unreleased/ak-fix-project-transfer-2.yml5
3 files changed, 8 insertions, 6 deletions
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