Commit e99701fb authored by Thomas Misilo's avatar Thomas Misilo

Changed wording in application.rb and gitlab.yml.example to match unicorn.rb....

Changed wording in application.rb and gitlab.yml.example to match unicorn.rb. This is for when using a non-root path
parent b688bac9
...@@ -70,11 +70,11 @@ module Gitlab ...@@ -70,11 +70,11 @@ module Gitlab
config.assets.version = '1.0' config.assets.version = '1.0'
# Uncomment and customize the last line to run in a non-root path # 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. # Note that three settings need to be changed for this to work.
# 1) In your application.rb file: config.relative_url_root = "/gitlab" # 1) In your application.rb file: config.relative_url_root = "/gitlab"
# 2) In your gitlab.yml file: 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" # config.relative_url_root = "/gitlab"
end end
......
...@@ -20,11 +20,11 @@ production: &base ...@@ -20,11 +20,11 @@ production: &base
https: false https: false
# Uncomment and customize the last line to run in a non-root path # 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. # Note that three settings need to be changed for this to work.
# 1) In your application.rb file: config.relative_url_root = "/gitlab" # 1) In your application.rb file: config.relative_url_root = "/gitlab"
# 2) In your gitlab.yml file: 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 # relative_url_root: /gitlab
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment