Merge branch 'sh-release-7.3.1' into 'master'

Release v7.4.0 See merge request gitlab-org/gitlab-workhorse!338

Merge branch 'sh-release-7.3.1' into 'master'
Release v7.4.0 See merge request gitlab-org/gitlab-workhorse!338
47f0e667 · Jacob Vosmaer · ced86655 · ea303303 · 47f0e667 · 47f0e667
Commit 47f0e667 authored Dec 04, 2018 by Jacob Vosmaer
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
@@ -4,6 +4,10 @@ Formerly known as 'gitlab-git-http-server'.

 UNRELEASED

+v 7.4.0
+
+- Strip port and include remote IP in access logs !337
+
 v 7.3.0

 - Redact sensitive url params as in Rails

--- a/VERSION
+++ b/VERSION
-7.3.0
+7.4.0