summaryrefslogtreecommitdiff
path: root/config/application.rb
diff options
context:
space:
mode:
authorAchilleas Pipinellis <axilleas@axilleas.me>2016-02-09 16:50:42 +0200
committerAchilleas Pipinellis <axilleas@axilleas.me>2016-02-09 16:59:42 +0200
commitb532109b97a7764aef808673a084da1731ed452d (patch)
treeb02fb1444b0e4f73f83c7e361cdddae158ebdc4e /config/application.rb
parent41a957591274895bc15848744c35ee28adea0682 (diff)
downloadgitlab-ce-b532109b97a7764aef808673a084da1731ed452d.tar.gz
Edit configuration files for relative URL support
[ci skip]
Diffstat (limited to 'config/application.rb')
-rw-r--r--config/application.rb15
1 files changed, 4 insertions, 11 deletions
diff --git a/config/application.rb b/config/application.rb
index d255ff0719f..17574d8c992 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -52,17 +52,10 @@ module Gitlab
config.action_view.sanitized_allowed_protocols = %w(smb)
- # Relative url support
- # 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 instead of this.
- # Note that following 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'] = "/gitlab"
- # 4) In ../gitlab-shell/config.yml: gitlab_url: "http://127.0.0.1/gitlab"
- # 5) In lib/support/nginx/gitlab : do not use asset gzipping, remove block starting with "location ~ ^/(assets)/"
- #
- # To update the path, run: sudo -u git -H bundle exec rake assets:precompile RAILS_ENV=production
+ # Relative URL support
+ # WARNING: We recommend using an FQDN to host GitLab in a root path instead of this.
+ # Documentation: http://doc.gitlab.com/ce/install/relative_url.html
+ # Uncomment and customize the following line to run in a non-root path
#
# config.relative_url_root = "/gitlab"