Download as
Browse Code »

Commit 6ec73fc9a64938566d2e6d1a804990fa0f8849f0

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

Configure the relative path only one time.

Showing 2 changed files with 3 additions and 7 deletions   Show diff stats
config/application.rb
  Diff comments   View file @6ec73fc
... ... @@ -67,9 +67,5 @@ 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 this if you are using a subdirectory
72   - # Note that ENV['RAILS_RELATIVE_URL_ROOT'] in config/puma.rb may need to be changed
73   - # config.relative_url_root = "/gitlab"
74 70 end
75 71 end
... ...
config/gitlab.yml.example
  Diff comments   View file @6ec73fc
... ... @@ -18,10 +18,10 @@ production: &base
18 18 host: localhost
19 19 port: 80
20 20 https: false
21   - # WARNING: This feature is no longer supported
  21 +
22 22 # Uncomment and customize to run in non-root path
23   - # Note that ENV['RAILS_RELATIVE_URL_ROOT'] in config/puma.rb may need to be changed
24   - # You need to uncomment config.relative_url_root in config/application.rb
  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
25 25 # relative_url_root: /gitlab
26 26  
27 27 # Uncomment and customize if you can't use the default user to run GitLab (default: 'git')
... ...