summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-07-02 08:43:40 +0000
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-07-02 08:43:40 +0000
commit7588186e8173f53a7f9b86d2b6959d7f94a3caac (patch)
tree4d86744c6f4d5dde2b5bdd1b92edbb443dae6d63
parent66e10f0566a979b5ba852b2f82a94d3a4280a4e7 (diff)
parent9e86f3b156848da323b64aed14676d14ec226d76 (diff)
downloadgitlab-ce-7588186e8173f53a7f9b86d2b6959d7f94a3caac.tar.gz
Merge branch 'warning_relative_url' of /home/git/repositories/gitlab/gitlabhq
-rw-r--r--config/gitlab.yml.example1
1 files changed, 1 insertions, 0 deletions
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example
index 9f50aab3c28..ad24ba97c6f 100644
--- a/config/gitlab.yml.example
+++ b/config/gitlab.yml.example
@@ -18,6 +18,7 @@ production: &base
host: localhost
port: 80
https: false
+ # WARNING: This feature is no longer supported
# Uncomment and customize to run in non-root path
# Note that ENV['RAILS_RELATIVE_URL_ROOT'] in config/puma.rb may need to be changed
# relative_url_root: /gitlab