Merge branch 'changelog-4.2.0' into 'master'

Changelog for 4.2.0 See merge request gitlab-org/gitlab-workhorse!255

Merge branch 'changelog-4.2.0' into 'master'
Changelog for 4.2.0 See merge request gitlab-org/gitlab-workhorse!255
5ee4b0a9 · Nick Thomas · 101377ee · d7461a17 · 5ee4b0a9 · 5ee4b0a9
Commit 5ee4b0a9 authored May 01, 2018 by Nick Thomas
Hide 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 4.2.0
+
+- Guess RemoteAddr from X-Forwarded-For !254
+
 v 4.1.0

 - Add websocket route for web terminal access to CI jobs !234

--- a/VERSION
+++ b/VERSION
-4.1.0
+4.2.0