From e99701fbfa6d5a2d4abd9cc1321a3575c86c85ea Mon Sep 17 00:00:00 2001
From: Thomas Misilo <misilot@fit.edu>
Date: Sun, 29 Sep 2013 13:46:02 -0400
Subject: [PATCH] Changed wording in application.rb and gitlab.yml.example to
match unicorn.rb. This is for when using a non-root path
---
config/application.rb | 4 ++--
config/gitlab.yml.example | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/config/application.rb b/config/application.rb
index 8ac07ef337a20..f483ccdad1799 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -70,11 +70,11 @@ class Application < Rails::Application
config.assets.version = '1.0'
# 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.
# 1) In your application.rb file: config.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"
end
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example
index c1cc9f872f323..8ece14526b3e4 100644
--- a/config/gitlab.yml.example
+++ b/config/gitlab.yml.example
@@ -20,11 +20,11 @@ production: &base
https: false
# 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.
# 1) In your application.rb file: config.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
--
GitLab