diff options
| author | Achilleas Pipinellis <axilleas@axilleas.me> | 2016-02-10 10:51:18 +0000 |
|---|---|---|
| committer | Achilleas Pipinellis <axilleas@axilleas.me> | 2016-02-10 10:51:18 +0000 |
| commit | 10aa99a30c311c59358d1547ebcbe0f6a92227a7 (patch) | |
| tree | f61c6a0000e42d4bbe2ffaba4ac0a08700880c27 /config/gitlab.yml.example | |
| parent | 17240f80cb11a0721da1416ecf38acc7aae9bccd (diff) | |
| parent | 464cea7d4892e76bcb39f0a3eaf848369178293a (diff) | |
| download | gitlab-ce-10aa99a30c311c59358d1547ebcbe0f6a92227a7.tar.gz | |
Merge branch 'doc_relative_url' into 'master'
Add documentation on relative URL support
closes #12773
See merge request !2770
Diffstat (limited to 'config/gitlab.yml.example')
| -rw-r--r-- | config/gitlab.yml.example | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index d6e2c9380a5..faf05ecd466 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -38,8 +38,12 @@ production: &base # Otherwise, ssh host will be set to the `host:` value above # ssh_host: ssh.host_example.com - # WARNING: See config/application.rb under "Relative url support" for the list of - # other files that need to be changed for relative url support + # Relative URL support + # WARNING: We recommend using an FQDN to host GitLab in a root path instead + # of using a relative URL. + # Documentation: http://doc.gitlab.com/ce/install/relative_url.html + # Uncomment and customize the following line to run in a non-root path + # # relative_url_root: /gitlab # Uncomment and customize if you can't use the default user to run GitLab (default: 'git') |