summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAsh McKenzie <amckenzie@gitlab.com>2022-04-07 03:16:58 +0000
committerAsh McKenzie <amckenzie@gitlab.com>2022-04-07 03:16:58 +0000
commit23f0c6f441500b6ef1dc892adc3fea84c6ecc888 (patch)
tree2d739046d8af0fac546ecacc6ce3577594f36933
parentfa5bf866e87fff104f84252293f4a177287cae94 (diff)
parentae3ec6c819f36418d4bfae0ea08639eb096d0b83 (diff)
downloadgitlab-shell-23f0c6f441500b6ef1dc892adc3fea84c6ecc888.tar.gz
Merge branch 'id-release-13.25.0' into 'main'v13.25.0
Release 13.25.0 See merge request gitlab-org/gitlab-shell!591
-rw-r--r--CHANGELOG6
-rw-r--r--VERSION2
2 files changed, 7 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 5f476b3..f5d16a1 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,9 @@
+v13.25.0
+
+- Fix connections duration metrics !588
+- ci: start integrating go 1.18 into the CI pipelines !587
+- Abort long-running unauthenticated SSH connections !582
+
v13.24.2
- Bump gitaly client !584
diff --git a/VERSION b/VERSION
index af3deaa..c80e5e5 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-13.24.2
+13.25.0