summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Thomas <nick@gitlab.com>2019-10-09 15:30:08 +0000
committerNick Thomas <nick@gitlab.com>2019-10-09 15:30:08 +0000
commit192299021f70383a52b38129b6bec31557f5eb1b (patch)
treea0b7d69a112d03a69980e53f63b3342c92a58c3d
parentb981cd5ae307936d0731b91a34aee1801a059ebd (diff)
parenta4df4b1f430cd107594d9790cad3ab3167e081ba (diff)
downloadgitlab-shell-10.1.0.tar.gz
Merge branch 'release-10-1' into 'master'v10.1.0
Version 10.1.0 See merge request gitlab-org/gitlab-shell!344
-rw-r--r--CHANGELOG7
-rw-r--r--VERSION2
2 files changed, 8 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 84328ed..ae11d98 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,10 @@
+v10.1.0
+- Remove feature flags and the fallback command !336
+- Remove an obsolete section from config.yml.example !339
+- Extend group IP restriction to Git activity !335
+- Remove deprecated create-hooks script !342
+- Rewrite `bin/check` in Go !341
+
v10.0.0
- Remove gitlab-keys script !329
diff --git a/VERSION b/VERSION
index a13e7b9..4149c39 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-10.0.0
+10.1.0