Merge branch '389-1-17-0-release' into 'master'v1.18.0

1.18.0 Release

See merge request gitlab-org/gitlab-pages!282

2 files changed, 9 insertions, 1 deletions

diff --git a/CHANGELOG b/CHANGELOG
index 503809f9..e21a1b00 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,11 @@
+v 1.18.0
+
+- Fix proxying artifacts with escaped characters !255
+- Introduce internal-gitlab-server flag to allow using the internal network for communicating to the GitLab server !276
+- Increase maximum idle connections pool size from 2 to 100 !274
+- Disable passing auth-related secret parameters as command line flags !269
+- Fix unused idle API connection bug !275
+
 v 1.17.0
 
 - Extract health check in its own middleware !247
diff --git a/VERSION b/VERSION
index 092afa15..84cc5294 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.17.0
+1.18.0