Download as
Browse Code »

Commit 7225c06934993e1c1deccf3adfc2ed770f69e0db

Authored by Mike Wyatt
1 parent 5857a7a9
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

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 @7225c06
@@ -46,7 +46,7 @@ Settings.gitlab['default_projects_limit'] ||= 10 @@ -46,7 +46,7 @@ Settings.gitlab['default_projects_limit'] ||= 10
46 Settings.gitlab['host'] ||= 'localhost' 46 Settings.gitlab['host'] ||= 'localhost'
47 Settings.gitlab['https'] = false if Settings.gitlab['https'].nil? 47 Settings.gitlab['https'] = false if Settings.gitlab['https'].nil?
48 Settings.gitlab['port'] ||= Settings.gitlab.https ? 443 : 80 48 Settings.gitlab['port'] ||= Settings.gitlab.https ? 443 : 80
49 -Settings.gitlab['relative_url_root'] ||= '' 49 +Settings.gitlab['relative_url_root'] ||= ENV['RAILS_RELATIVE_URL_ROOT'] || ''
50 Settings.gitlab['protocol'] ||= Settings.gitlab.https ? "https" : "http" 50 Settings.gitlab['protocol'] ||= Settings.gitlab.https ? "https" : "http"
51 Settings.gitlab['email_from'] ||= "gitlab@#{Settings.gitlab.host}" 51 Settings.gitlab['email_from'] ||= "gitlab@#{Settings.gitlab.host}"
52 Settings.gitlab['support_email'] ||= Settings.gitlab.email_from 52 Settings.gitlab['support_email'] ||= Settings.gitlab.email_from