Merge branch 'release-8-18' into 'master'

Release v8.18.0 See merge request gitlab-org/gitlab-workhorse!450

Merge branch 'release-8-18' into 'master'
Release v8.18.0 See merge request gitlab-org/gitlab-workhorse!450
9a9a83e7 · Nick Thomas · 6c72135f · 8926563a · 9a9a83e7 · 9a9a83e7
Commit 9a9a83e7 authored Dec 19, 2019 by Nick Thomas
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

CHANGELOG CHANGELOG +2 -1

VERSION VERSION +1 -1

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

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

-Next
+v 8.18.0

 - Allow inline content disposition for pdf files !446
+- Update environment websocket route !449

 v 8.17.0


--- a/VERSION
+++ b/VERSION
-8.17.0
+8.18.0