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:
authorGrzegorz Bizon <grzesiek.bizon@gmail.com>2020-02-18 14:58:07 +0300
committerGrzegorz Bizon <grzesiek.bizon@gmail.com>2020-02-18 14:58:07 +0300
commitb859280bce9e347987e0878ae28aee8033954158 (patch)
tree962170f5ca8230a44456a9a7c293b1d5eebb0403
parent8cc214da3afaf3d30787fe6b8d2c20f240ad2245 (diff)
parent1fe3f552049912c98063d67ca6a0c2da626cb324 (diff)
Merge branch 'master' into feature/gb/serverless-serving-enable
* master: 1.16.0 Release Fix broken CI pipeline badge
-rw-r--r--CHANGELOG5
-rw-r--r--README.md3
-rw-r--r--VERSION2
3 files changed, 7 insertions, 3 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 9b2a02ed..ff441801 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,8 @@
+v 1.16.0
+
+- Add metrics for GitLab API calls !229
+- Change the way proxy headers like `X-Forwarded-For` are handled !225
+
v 1.15.0
- Implement support for incremental rollout of the new API based configuration source
diff --git a/README.md b/README.md
index 00334760..ad4c9219 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,6 @@
## GitLab Pages Daemon
-[![build status](https://gitlab.com/gitlab-org/gitlab-pages/badges/master/build.svg)](https://gitlab.com/gitlab-org/gitlab-pages/commits/master)
-
+[![build status](https://gitlab.com/gitlab-org/gitlab-pages/badges/master/pipeline.svg)](https://gitlab.com/gitlab-org/gitlab-pages/commits/master)
[![coverage report](https://gitlab.com/gitlab-org/gitlab-pages/badges/master/coverage.svg)](https://gitlab.com/gitlab-org/gitlab-pages/commits/master)
This is a simple HTTP server written in Go, made to serve GitLab Pages with
diff --git a/VERSION b/VERSION
index 141f2e80..15b989e3 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.15.0
+1.16.0