Download as
Browse Code »

Commit d5663e148fdf8d1c767479e62c86c7a2b4db654e

Authored by Dmitriy Zaporozhets
2 parents 0c06b7fe 7225c069
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Merge pull request #2870 from mikew/relative-url-root-default 

default gitlab.relative_url_root to ENV['RAILS_RELATIVE_URL_ROOT']
Showing 1 changed file with 1 additions and 1 deletions   Show diff stats
config/initializers/1_settings.rb
  Diff comments   View file @d5663e1
... ... @@ -52,7 +52,7 @@ Settings.gitlab['default_projects_limit'] ||= 10
52 52 Settings.gitlab['host'] ||= 'localhost'
53 53 Settings.gitlab['https'] = false if Settings.gitlab['https'].nil?
54 54 Settings.gitlab['port'] ||= Settings.gitlab.https ? 443 : 80
55   -Settings.gitlab['relative_url_root'] ||= ''
  55 +Settings.gitlab['relative_url_root'] ||= ENV['RAILS_RELATIVE_URL_ROOT'] || ''
56 56 Settings.gitlab['protocol'] ||= Settings.gitlab.https ? "https" : "http"
57 57 Settings.gitlab['email_from'] ||= "gitlab@#{Settings.gitlab.host}"
58 58 Settings.gitlab['support_email'] ||= Settings.gitlab.email_from
... ...