summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIgor Drozdov <idrozdov@gitlab.com>2022-09-28 09:05:22 +0000
committerIgor Drozdov <idrozdov@gitlab.com>2022-09-28 09:05:22 +0000
commit6888aaeeb3ebf7fa9e9958384df1ccb315b0e7f8 (patch)
tree550a2e772d087e89a36d15696abc9970c4334726
parent558e02770ac1f76782f35af017012546c1dc6cc0 (diff)
parent5bb892b8fbddaaba627de87c7aa286e77707dfac (diff)
downloadgitlab-shell-6888aaeeb3ebf7fa9e9958384df1ccb315b0e7f8.tar.gz
Merge branch 'id-release-14-12-0' into 'main'v14.12.0
Release v14.12.0 See merge request https://gitlab.com/gitlab-org/gitlab-shell/-/merge_requests/687 Merged-by: Igor Drozdov <idrozdov@gitlab.com> Approved-by: Igor Drozdov <idrozdov@gitlab.com>
-rw-r--r--CHANGELOG7
-rw-r--r--VERSION2
2 files changed, 8 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG
index fc12d2a..b3b3747 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,10 @@
+v14.12.0
+
+- Trim secret before signing JWT tokens !686
+- Bump .tool-versions to use Go 1.18.6 !685
+- Update Gitaly to 15.4.0-rc2 !681
+- Test against Golang v1.19 !680
+
v14.11.0
- Update Gitaly to v15 !676
diff --git a/VERSION b/VERSION
index bfbf3ff..27fbdeb 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.11.0
+14.12.0