summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIgor <idrozdov@gitlab.com>2020-03-02 08:08:30 +0000
committerIgor <idrozdov@gitlab.com>2020-03-02 08:08:30 +0000
commitb920520599142435ce06ad155099544adc923618 (patch)
treed64875adb42d712a277beab92a32cb1fddd237a5
parentaaa6c882096ba29113d2762ed278d6127d0baed4 (diff)
parentbda2cb8252f521b2b4116238cac2aec6008eeceb (diff)
downloadgitlab-shell-b920520599142435ce06ad155099544adc923618.tar.gz
Merge branch 'release-12-0-0' into 'master'v12.0.0
Release v12.0.0 See merge request gitlab-org/gitlab-shell!365
-rw-r--r--CHANGELOG5
-rw-r--r--VERSION2
2 files changed, 5 insertions, 2 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 6fb1047..83a84be 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,7 @@
-v11.1.0
+v12.0.0
+- openssh: Accept GIT_PROTOCOL environment variable !364
+
+v11.0.0
- Bump Ruby version to 2.6.5 !357
- Remove support for Custom data.info_message !356
diff --git a/VERSION b/VERSION
index 275283a..4044f90 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-11.0.0
+12.0.0