diff options
| author | Thomas Misilo <misilot@fit.edu> | 2013-09-29 13:46:02 -0400 |
|---|---|---|
| committer | Thomas Misilo <misilot@fit.edu> | 2013-09-29 13:46:02 -0400 |
| commit | e99701fbfa6d5a2d4abd9cc1321a3575c86c85ea (patch) | |
| tree | d5a98291730dcd55af8eb40b8cd3fad5e1026b24 /config | |
| parent | b688bac9b6ca02571ed9fb3149e5b3bb6052c9fb (diff) | |
| download | gitlab-ce-e99701fbfa6d5a2d4abd9cc1321a3575c86c85ea.tar.gz | |
Changed wording in application.rb and gitlab.yml.example to match unicorn.rb. This is for when using a non-root path
Diffstat (limited to 'config')
| -rw-r--r-- | config/application.rb | 4 | ||||
| -rw-r--r-- | config/gitlab.yml.example | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/config/application.rb b/config/application.rb index 8ac07ef337a..f483ccdad17 100644 --- a/config/application.rb +++ b/config/application.rb @@ -70,11 +70,11 @@ module Gitlab config.assets.version = '1.0' # Uncomment and customize the last line to run in a non-root path - # WARNING: This feature is no longer supported + # WARNING: This feature is known to work, but unsupported # 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 - # 3) In your unicorn.rb: ENV['RAILS_RELATIVE_URL_ROOT'] + # 3) In your unicorn.rb: ENV['RAILS_RELATIVE_URL_ROOT'] = "/gitlab" # # config.relative_url_root = "/gitlab" end diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index c1cc9f872f3..8ece14526b3 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -20,11 +20,11 @@ production: &base https: false # Uncomment and customize the last line to run in a non-root path - # WARNING: This feature is no longer supported + # WARNING: This feature is known to work, but unsupported # 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 - # 3) In your unicorn.rb: ENV['RAILS_RELATIVE_URL_ROOT'] + # 3) In your unicorn.rb: ENV['RAILS_RELATIVE_URL_ROOT'] = "/gitlab" # # relative_url_root: /gitlab |