summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIgor Drozdov <idrozdov@gitlab.com>2022-05-11 03:16:47 +0000
committerIgor Drozdov <idrozdov@gitlab.com>2022-05-11 03:16:47 +0000
commitd700799b357caa0a738aadb857e4f9914c86dd32 (patch)
tree1915c9b450d87c2e078ca6b3e23f55b8535cb9bd
parent42715b4c093a3c6b7bd80752709509ac829962e8 (diff)
parent292a9035ad19b2a685ec08a8f54701322d131658 (diff)
downloadgitlab-shell-d700799b357caa0a738aadb857e4f9914c86dd32.tar.gz
Merge branch 'sh-release-14.1.0' into 'main'v14.1.0
Release 14.1.0 See merge request gitlab-org/gitlab-shell!620
-rw-r--r--CHANGELOG8
-rw-r--r--VERSION2
2 files changed, 9 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 185d191..7e9dc0f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,12 @@
+v14.1.0
+
+- Make PROXY policy configurable !619
+- Exclude authentication errors from apdex !611
+- Fix check_ip argument when gitlab-sshd used with PROXY protocol !616
+- Use labkit for FIPS check !607
+
v14.0.0
+
- Always use Gitaly sidechannel connections !567
v13.26.0
diff --git a/VERSION b/VERSION
index 4b964e9..7b3b6e0 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.0.0
+14.1.0