Merge branch 'changelog-7.0.0' into 'master'

Prepare 7.0.0 release See merge request gitlab-org/gitlab-workhorse!302

Merge branch 'changelog-7.0.0' into 'master'
Prepare 7.0.0 release See merge request gitlab-org/gitlab-workhorse!302
279962ec · Nick Thomas · 81081f31 · 124e8333 · 279962ec · 279962ec
Commit 279962ec authored Sep 28, 2018 by Nick Thomas
Show whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

CHANGELOG CHANGELOG +4 -0

VERSION VERSION +1 -1

No files found.
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,10 @@

 Formerly known as 'gitlab-git-http-server'.

+v 7.0.0
+
+- Use the new Gitaly auth scheme (v2) !298
+
 v 6.1.1

 - Allow custom error messages to pass through to Rails !300

--- a/VERSION
+++ b/VERSION
-6.1.1
+7.0.0