Merge branch '268-1-12-release' into 'master'v1.12.01-12-stable

Release 1.12.0

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

2 files changed, 7 insertions, 1 deletions

diff --git a/CHANGELOG b/CHANGELOG
index 1eba177f..fd693b93 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,9 @@
+v 1.12.0
+
+- Add minimal support for the api-secret-key config flag (not yet used)
+- Add warnings about secrets given through command-line flags
+- Remove Admin gRPC api (was never used)
+
 v 1.11.0
 
 - Refactor domain package and extract disk serving !189
diff --git a/VERSION b/VERSION
index 1cac385c..0eed1a29 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.11.0
+1.12.0