summaryrefslogtreecommitdiff
path: root/config/application.rb
diff options
context:
space:
mode:
authorAchilleas Pipinellis <axilleas@axilleas.me>2016-02-10 10:51:18 +0000
committerAchilleas Pipinellis <axilleas@axilleas.me>2016-02-10 10:51:18 +0000
commit10aa99a30c311c59358d1547ebcbe0f6a92227a7 (patch)
treef61c6a0000e42d4bbe2ffaba4ac0a08700880c27 /config/application.rb
parent17240f80cb11a0721da1416ecf38acc7aae9bccd (diff)
parent464cea7d4892e76bcb39f0a3eaf848369178293a (diff)
downloadgitlab-ce-10aa99a30c311c59358d1547ebcbe0f6a92227a7.tar.gz
Merge branch 'doc_relative_url' into 'master'
Add documentation on relative URL support closes #12773 See merge request !2770
Diffstat (limited to 'config/application.rb')
-rw-r--r--config/application.rb16
1 files changed, 5 insertions, 11 deletions
diff --git a/config/application.rb b/config/application.rb
index 33d7b881fa4..1e9ec74cdbf 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -52,17 +52,11 @@ 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 using a relative URL.
+ # 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"