diff options
| author | Stan Hu <stanhu@gmail.com> | 2018-02-04 13:55:36 +0000 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2018-02-04 13:55:36 +0000 |
| commit | cf887a8b3108edb715ee5618377f4ffab1824d85 (patch) | |
| tree | 58d67efc9868786470ec2a6d86cb72ef4855ad5e | |
| parent | 295ff65d621a6c6526fa76cbbcda058862db4041 (diff) | |
| parent | c939df51c82c30a7ec9a7f83130b2e5d5fa0c5c6 (diff) | |
| download | gitlab-ce-cf887a8b3108edb715ee5618377f4ffab1824d85.tar.gz | |
Merge branch '42023-fix-cdn-host-documentation' into 'master'
Resolve "Specifying asset host produces broken URL"
Closes #42023
See merge request gitlab-org/gitlab-ce!16915
| -rw-r--r-- | doc/administration/environment_variables.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/administration/environment_variables.md b/doc/administration/environment_variables.md index 9bcd13a52f7..e6c8f59549f 100644 --- a/doc/administration/environment_variables.md +++ b/doc/administration/environment_variables.md @@ -13,7 +13,7 @@ override certain values. Variable | Type | Description -------- | ---- | ----------- -`GITLAB_CDN_HOST` | string | Sets the hostname for a CDN to serve static assets (e.g. `mycdnsubdomain.fictional-cdn.com`) +`GITLAB_CDN_HOST` | string | Sets the base URL for a CDN to serve static assets (e.g. `//mycdnsubdomain.fictional-cdn.com`) `GITLAB_ROOT_PASSWORD` | string | Sets the password for the `root` user on installation `GITLAB_HOST` | string | The full URL of the GitLab server (including `http://` or `https://`) `RAILS_ENV` | string | The Rails environment; can be one of `production`, `development`, `staging` or `test` |