diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-11-30 08:07:36 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-11-30 08:07:36 +0000 |
| commit | 931e6a721f44d5042a019eca189fac677f719006 (patch) | |
| tree | ff732c2f35318eb57fe21aa59ae435fd4f798983 /config | |
| parent | 31359516408ec108d684a6b2b4ffe6098703aa78 (diff) | |
| parent | b8cb7df76102db12a11bca81674882911fcfbcd8 (diff) | |
| download | gitlab-ce-931e6a721f44d5042a019eca189fac677f719006.tar.gz | |
Merge branch 'relative-url-needs-warning' of /home/git/repositories/gitlab/gitlabhq
Diffstat (limited to 'config')
| -rw-r--r-- | config/application.rb | 2 | ||||
| -rw-r--r-- | config/gitlab.yml.example | 2 | ||||
| -rw-r--r-- | config/unicorn.rb.example | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/config/application.rb b/config/application.rb index 0dd632d04bb..c46ff289cf8 100644 --- a/config/application.rb +++ b/config/application.rb @@ -70,7 +70,7 @@ module Gitlab config.assets.version = '1.0' # Uncomment and customize the last line to run in a non-root path - # WARNING: We recommend creating a FQDN to host GitLab in a root path. + # WARNING: We recommend creating a FQDN to host GitLab in a root path instead of this. # Note that three settings need to be changed for this to work. # 1) In your application.rb file: config.relative_url_root = "/gitlab" # 2) In your gitlab.yml file: relative_url_root: /gitlab diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index 0688fafafe2..f37381519b3 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -20,7 +20,7 @@ production: &base https: false # Uncomment and customize the last line to run in a non-root path - # We recommend creating a FQDN to host GitLab in a root path. + # WARNING: We recommend creating a FQDN to host GitLab in a root path instead of this. # Note that three settings need to be changed for this to work. # 1) In your application.rb file: config.relative_url_root = "/gitlab" # 2) In your gitlab.yml file: relative_url_root: /gitlab diff --git a/config/unicorn.rb.example b/config/unicorn.rb.example index 445de22be08..70dc0cb842a 100644 --- a/config/unicorn.rb.example +++ b/config/unicorn.rb.example @@ -9,7 +9,7 @@ # documentation. # Uncomment and customize the last line to run in a non-root path -# We recommend creating a FQDN to host GitLab in a root path. +# WARNING: We recommend creating a FQDN to host GitLab in a root path instead of this. # Note that three settings need to be changed for this to work. # 1) In your application.rb file: config.relative_url_root = "/gitlab" # 2) In your gitlab.yml file: relative_url_root: /gitlab |