Commit 22d3aa4e32ec9204c8ceeed8e4c0492bb1a5a6bb

Authored by Sytse Sijbrandij
1 parent 09d00563

Unsupported is unclear.

config/application.rb
@@ -70,7 +70,7 @@ module Gitlab @@ -70,7 +70,7 @@ module Gitlab
70 config.assets.version = '1.0' 70 config.assets.version = '1.0'
71 71
72 # Uncomment and customize the last line to run in a non-root path 72 # Uncomment and customize the last line to run in a non-root path
73 - # WARNING: This feature is known to work, but unsupported 73 + # WARNING: We recommend creating a FQDN to host GitLab in a root path.
74 # Note that three settings need to be changed for this to work. 74 # Note that three settings need to be changed for this to work.
75 # 1) In your application.rb file: config.relative_url_root = "/gitlab" 75 # 1) In your application.rb file: config.relative_url_root = "/gitlab"
76 # 2) In your gitlab.yml file: relative_url_root: /gitlab 76 # 2) In your gitlab.yml file: relative_url_root: /gitlab
config/gitlab.yml.example
@@ -20,7 +20,7 @@ production: &base @@ -20,7 +20,7 @@ production: &base
20 https: false 20 https: false
21 21
22 # Uncomment and customize the last line to run in a non-root path 22 # Uncomment and customize the last line to run in a non-root path
23 - # WARNING: This feature is known to work, but unsupported 23 + # We recommend creating a FQDN to host GitLab in a root path.
24 # Note that three settings need to be changed for this to work. 24 # Note that three settings need to be changed for this to work.
25 # 1) In your application.rb file: config.relative_url_root = "/gitlab" 25 # 1) In your application.rb file: config.relative_url_root = "/gitlab"
26 # 2) In your gitlab.yml file: relative_url_root: /gitlab 26 # 2) In your gitlab.yml file: relative_url_root: /gitlab
config/unicorn.rb.example
@@ -9,7 +9,7 @@ @@ -9,7 +9,7 @@
9 # documentation. 9 # documentation.
10 10
11 # Uncomment and customize the last line to run in a non-root path 11 # Uncomment and customize the last line to run in a non-root path
12 -# WARNING: This feature is known to work, but unsupported 12 +# We recommend creating a FQDN to host GitLab in a root path.
13 # Note that three settings need to be changed for this to work. 13 # Note that three settings need to be changed for this to work.
14 # 1) In your application.rb file: config.relative_url_root = "/gitlab" 14 # 1) In your application.rb file: config.relative_url_root = "/gitlab"
15 # 2) In your gitlab.yml file: relative_url_root: /gitlab 15 # 2) In your gitlab.yml file: relative_url_root: /gitlab