summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--config/application.rb2
-rw-r--r--config/gitlab.yml.example2
-rw-r--r--config/unicorn.rb.example2
3 files changed, 3 insertions, 3 deletions
diff --git a/config/application.rb b/config/application.rb
index 82e74e7250d..0dd632d04bb 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -70,7 +70,7 @@ module Gitlab
config.assets.version = '1.0'
# Uncomment and customize the last line to run in a non-root path
- # WARNING: This feature is known to work, but unsupported
+ # WARNING: We recommend creating a FQDN to host GitLab in a root path.
# 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
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example
index 6b527cf0212..0688fafafe2 100644
--- a/config/gitlab.yml.example
+++ b/config/gitlab.yml.example
@@ -20,7 +20,7 @@ production: &base
https: false
# Uncomment and customize the last line to run in a non-root path
- # WARNING: This feature is known to work, but unsupported
+ # We recommend creating a FQDN to host GitLab in a root path.
# 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
diff --git a/config/unicorn.rb.example b/config/unicorn.rb.example
index e4e13426831..445de22be08 100644
--- a/config/unicorn.rb.example
+++ b/config/unicorn.rb.example
@@ -9,7 +9,7 @@
# documentation.
# Uncomment and customize the last line to run in a non-root path
-# WARNING: This feature is known to work, but unsupported
+# We recommend creating a FQDN to host GitLab in a root path.
# 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