From 53d75c268ae2be8e9e6ad12e80436f63df0dc62e Mon Sep 17 00:00:00 2001 From: solidnerd Date: Thu, 26 Oct 2017 23:06:15 +0200 Subject: [PATCH] Update README and Changelog for 10.1.0 Signed-off-by: solidnerd --- Changelog.md | 7 +++++++ README.md | 3 ++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/Changelog.md b/Changelog.md index d80b8963..cf3334bd 100644 --- a/Changelog.md +++ b/Changelog.md @@ -3,6 +3,13 @@ This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG]( https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) for the list of changes in GitLab. + +**10.1.0** +- gitlab: upgrade to CE v10.1.0 +- REMOVED `GITALY_ENABLED`` +- ADDED `GITALY_ARTIFACTS_SERVER` +- ADDED `GITALY_CLIENT_PATH` + **10.0.4** - gitlab: upgrade to CE v10.0.4 diff --git a/README.md b/README.md index 895f61d6..42c3c78e 100644 --- a/README.md +++ b/README.md @@ -879,10 +879,11 @@ Below is the complete list of available options that can be used to customize yo | `GITLAB_PAGES_DIR` | Sets GitLab Pages directory where all pages will be stored. Defaults to `$GITLAB_SHARED_DIR/pages` | | `GITLAB_PAGES_PORT`| Sets GitLab Pages Port that will be used in NGINX. Defaults to `80` | | `GITLAB_PAGES_HTTPS` | Sets GitLab Pages to HTTPS and the gitlab-pages-ssl config will be used. Defaults to `false` | +| `GITALY_ARTIFACTS_SERVER` | Set to `true` to enable pages artifactsserver, enabled by default. | | `GITLAB_PAGES_EXTERNAL_HTTP` | Sets GitLab Pages external http to receive request on an independen port. Disabled by default | | `GITLAB_PAGES_EXTERNAL_HTTPS` | Sets GitLab Pages external https to receive request on an independen port. Disabled by default | | `GITLAB_HTTPS` | Set to `true` to enable https support, disabled by default. | -| `GITALY_ENABLED` | Set to `true` to enable gitaly, enabled by default. | +| `GITALY_CLIENT_PATH` | Set default path for gitaly. defaults to `/home/git/gitaly` | | `GITALY_TOKEN` | Set a gitaly token, blank by default. | | `GITLAB_MONITORING_UNICORN_SAMPLER_INTERVAL` | Time between sampling of unicorn socket metrics, in seconds, defaults to `10` | | `GITLAB_MONITORING_IP_WHITELIST` | IP whitelist to access monitoring endpoints, defaults to `0.0.0.0/8` |