diff --git a/config/application.rb b/config/application.rb index d86fe561fa9..f7349fa009b 100644 --- a/config/application.rb +++ b/config/application.rb @@ -67,5 +67,14 @@ module Gitlab # Version of your assets, change this if you want to expire all your assets 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 + # 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'] + # + # config.relative_url_root = "/gitlab" end end diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index 61a6f0be0b3..59a4d1fd41b 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -19,9 +19,13 @@ production: &base port: 80 https: false - # Uncomment and customize to run in non-root path + # Uncomment and customize the last line to run in a non-root path # WARNING: This feature is no longer supported - # Note that ENV['RAILS_RELATIVE_URL_ROOT'] in your application server may need to be changed + # 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'] + # # relative_url_root: /gitlab # Uncomment and customize if you can't use the default user to run GitLab (default: 'git')