Download as
Browse Code »

Commit 63009af1176c114029827679c3eb632ad5edca26

Authored by Sytse Sijbrandij
1 parent 7c55c73d
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Relative root needs to be changed in three places.

Showing 2 changed files with 15 additions and 2 deletions   Show diff stats
config/application.rb
  Diff comments   View file @63009af
... ... @@ -67,5 +67,14 @@ module Gitlab
67 67  
68 68 # Version of your assets, change this if you want to expire all your assets
69 69 config.assets.version = '1.0'
  70 +
  71 + # Uncomment and customize the last line to run in a non-root path
  72 + # WARNING: This feature is no longer supported
  73 + # Note that three settings need to be changed for this to work.
  74 + # 1) In your application.rb file: config.relative_url_root = "/gitlab"
  75 + # 2) In your gitlab.yml file: relative_url_root: /gitlab
  76 + # 3) In your unicorn.rb: ENV['RAILS_RELATIVE_URL_ROOT']
  77 + #
  78 + # config.relative_url_root = "/gitlab"
70 79 end
71 80 end
... ...
config/gitlab.yml.example
  Diff comments   View file @63009af
... ... @@ -19,9 +19,13 @@ production: &base
19 19 port: 80
20 20 https: false
21 21  
22   - # Uncomment and customize to run in non-root path
  22 + # Uncomment and customize the last line to run in a non-root path
23 23 # WARNING: This feature is no longer supported
24   - # Note that ENV['RAILS_RELATIVE_URL_ROOT'] in your application server may need to be changed
  24 + # Note that three settings need to be changed for this to work.
  25 + # 1) In your application.rb file: config.relative_url_root = "/gitlab"
  26 + # 2) In your gitlab.yml file: relative_url_root: /gitlab
  27 + # 3) In your unicorn.rb: ENV['RAILS_RELATIVE_URL_ROOT']
  28 + #
25 29 # relative_url_root: /gitlab
26 30  
27 31 # Uncomment and customize if you can't use the default user to run GitLab (default: 'git')
... ...