Merge branch '193-release-1-4-0' into 'master'v1.4.01-4-stable

Release Pages v1.4.0

Closes #193

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

2 files changed, 6 insertions, 1 deletions

diff --git a/CHANGELOG b/CHANGELOG
index 80fc771d..9713c011 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,8 @@
+v 1.4.0
+- Prevent wrong mimetype being set for GZipped files with unknown file extension !122
+- Pages for subgroups !123
+- Make content-type detection consistent between file types !126
+
 v 1.3.1
 - Fix TOCTOU race condition when serving files
 
diff --git a/VERSION b/VERSION
index 3a3cd8cc..88c5fb89 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.3.1
+1.4.0