diff options
| author | Sytse Sijbrandij <sytse@dosire.com> | 2013-08-19 21:49:27 +0200 |
|---|---|---|
| committer | Sytse Sijbrandij <sytse@dosire.com> | 2013-08-19 21:49:27 +0200 |
| commit | 6ec73fc9a64938566d2e6d1a804990fa0f8849f0 (patch) | |
| tree | 169857b0957a7dbae72cc44f2c74bf64b66875c0 | |
| parent | 4250c349152e252ff36bab54c53d7b267a5b1232 (diff) | |
| download | gitlab-ce-6ec73fc9a64938566d2e6d1a804990fa0f8849f0.tar.gz | |
Configure the relative path only one time.
| -rw-r--r-- | config/application.rb | 4 | ||||
| -rw-r--r-- | config/gitlab.yml.example | 6 |
2 files changed, 3 insertions, 7 deletions
diff --git a/config/application.rb b/config/application.rb index f3edca8c353..d86fe561fa9 100644 --- a/config/application.rb +++ b/config/application.rb @@ -67,9 +67,5 @@ module Gitlab # Version of your assets, change this if you want to expire all your assets config.assets.version = '1.0' - - # Uncomment this if you are using a subdirectory - # Note that ENV['RAILS_RELATIVE_URL_ROOT'] in config/puma.rb may need to be changed - # config.relative_url_root = "/gitlab" end end diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index c73307cabf4..61a6f0be0b3 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -18,10 +18,10 @@ production: &base host: localhost port: 80 https: false - # WARNING: This feature is no longer supported + # Uncomment and customize to run in non-root path - # Note that ENV['RAILS_RELATIVE_URL_ROOT'] in config/puma.rb may need to be changed - # You need to uncomment config.relative_url_root in config/application.rb + # WARNING: This feature is no longer supported + # Note that ENV['RAILS_RELATIVE_URL_ROOT'] in your application server may need to be changed # relative_url_root: /gitlab # Uncomment and customize if you can't use the default user to run GitLab (default: 'git') |