Merge branch 'release-7.6.0' into 'master'

Changelog for 7.6.0 See merge request gitlab-org/gitlab-workhorse!347

Merge branch 'release-7.6.0' into 'master'
Changelog for 7.6.0 See merge request gitlab-org/gitlab-workhorse!347
66b96dc2 · Jacob Vosmaer · cac729e2 · 8d4a33dc · 66b96dc2 · 66b96dc2
Commit 66b96dc2 authored Dec 10, 2018 by Jacob Vosmaer
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 2 deletions

CHANGELOG CHANGELOG +4 -1

VERSION VERSION +1 -1

No files found.
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,9 +2,12 @@
 Formerly known as 'gitlab-git-http-server'.
-UNRELEASED
+v 7.6.0
 - Rename correlation-id structured logging field to correlation_id !343
+- Remove local git receive-pack implementation !326
+- Remove curl from sendfile_test.go !344
+- Update README.md usage example !342
 v 7.5.0

--- a/VERSION
+++ b/VERSION
-7.5.0
+7.6.0