summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Thomas <nick@gitlab.com>2021-09-23 08:21:04 +0000
committerNick Thomas <nick@gitlab.com>2021-09-23 08:21:04 +0000
commit593961bae309e92e9bff550d0231092f44813b06 (patch)
treea972642d7a759383635b70e439037134c2ec712a
parent0d8f48e5ceda334236d3478026bf6247c26a43c9 (diff)
parent40e0f11faf521f48f41e98ec32005a98a8e47247 (diff)
downloadgitlab-shell-13-21-stable.tar.gz
Merge branch 'sh-release-13-21-1' into '13-21-stable'v13.21.113-21-stable
Release v13.21.1 See merge request gitlab-org/gitlab-shell!529
-rw-r--r--CHANGELOG4
-rw-r--r--VERSION2
2 files changed, 5 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 5927023..ec84969 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,7 @@
+v13.21.1
+
+- Only validate SSL cert file exists if a value is supplied !527
+
v13.21.0
- Change default logging format to JSON !476
diff --git a/VERSION b/VERSION
index 9dafbf9..12e42d2 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-13.21.0
+13.21.1