Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-pages.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVladimir Shushlin <vshushlin@gitlab.com>2020-01-30 11:42:35 +0300
committerVladimir Shushlin <vshushlin@gitlab.com>2020-01-30 11:42:35 +0300
commitac272f96081c8ffaa1ca5ba3459ff1e47a6e9bb3 (patch)
treee7f90e51abb92abdb1385e5e6cfc719cd75dbf25
parentf316fbf094402db2cf36c44639eeb3ae2f32c94b (diff)
parent01fee6e722afdfc03f1401def45450caba553e38 (diff)
Merge branch '344-1-15-release' into 'master'v1.15.0
Release 1.15.0 See merge request gitlab-org/gitlab-pages!228
-rw-r--r--CHANGELOG6
-rw-r--r--VERSION2
2 files changed, 7 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 5d89f579..9b2a02ed 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,9 @@
+v 1.15.0
+
+- Implement support for incremental rollout of the new API based configuration source
+- Add domain configuration duration (from disk) to the exported Prometheus metrics
+- Make GitLab API client timeout and JWT expiry configurable
+
v 1.14.0
- Rollback godirwalk to v1.10.12 due to significant performance degradation
diff --git a/VERSION b/VERSION
index 850e7424..141f2e80 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.14.0
+1.15.0