Merge branch 'release-1-6-0' into 'master'v1.6.0

Release v1.6.0

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

2 files changed, 10 insertions, 1 deletions

diff --git a/CHANGELOG b/CHANGELOG
index cbdfc814..43bd7eb4 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,12 @@
+v 1.6.0
+
+- Use proxy from environment for http request !131
+- Use STDOUT for flag outputs !132
+- Prepare pages auth logs for production rollout !138
+- Redirect unknown ACME challenges to the GitLab instance !141
+- Disable 3DES and other insecure cipher suites !145
+- Provide ability to disable old TLS versions !146
+
 v 1.5.0
 
 - Make extensionless URLs work !112
diff --git a/VERSION b/VERSION
index bc80560f..dc1e644a 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.5.0
+1.6.0