Merge branch 'changelog-3.7.0' into 'master'

Changelog for 3.7.0 See merge request gitlab-org/gitlab-workhorse!233

Merge branch 'changelog-3.7.0' into 'master'
Changelog for 3.7.0 See merge request gitlab-org/gitlab-workhorse!233
6e263a58 · Jacob Vosmaer (GitLab) · 2dc14489 · 4b4957d9 · 6e263a58 · 6e263a58
Commit 6e263a58 authored Feb 22, 2018 by Jacob Vosmaer (GitLab)
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 1 deletion

CHANGELOG CHANGELOG +5 -0

VERSION VERSION +1 -1

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

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

+v3.7.0
+
+- Allow sending Git archives with file names other than 'archive' !232
+- Unify uploads handling under filestore package !230
+
 v3.6.0

 - Introduce a `send-url:` method that allows to serve remote HTTP/GET file, like S3-based file !228

--- a/VERSION
+++ b/VERSION
-3.6.0
+3.7.0