summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorSytse Sijbrandij <sytse@dosire.com>2013-11-29 08:57:45 +0100
committerSytse Sijbrandij <sytse@dosire.com>2013-11-29 08:57:45 +0100
commitb8cb7df76102db12a11bca81674882911fcfbcd8 (patch)
tree82139bcde0247cd8ecb18607c5bf01a2b3f8fdc1 /config
parent2e07865f16f96bc4706758cc5f2634574d38be37 (diff)
downloadgitlab-ce-b8cb7df76102db12a11bca81674882911fcfbcd8.tar.gz
Add warning back.
Diffstat (limited to 'config')
-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 0dd632d04bb..c46ff289cf8 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: We recommend creating a FQDN to host GitLab in a root path.
+ # WARNING: We recommend creating a FQDN to host GitLab in a root path instead of this.
# 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 0688fafafe2..f37381519b3 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
- # We recommend creating a FQDN to host GitLab in a root path.
+ # WARNING: We recommend creating a FQDN to host GitLab in a root path instead of this.
# 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 445de22be08..70dc0cb842a 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
-# We recommend creating a FQDN to host GitLab in a root path.
+# WARNING: We recommend creating a FQDN to host GitLab in a root path instead of this.
# 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