Commit d5663e148fdf8d1c767479e62c86c7a2b4db654e
Exists in
master
and in
4 other branches
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
| @@ -52,7 +52,7 @@ Settings.gitlab['default_projects_limit'] ||= 10 | @@ -52,7 +52,7 @@ Settings.gitlab['default_projects_limit'] ||= 10 | ||
| 52 | Settings.gitlab['host'] ||= 'localhost' | 52 | Settings.gitlab['host'] ||= 'localhost' |
| 53 | Settings.gitlab['https'] = false if Settings.gitlab['https'].nil? | 53 | Settings.gitlab['https'] = false if Settings.gitlab['https'].nil? |
| 54 | Settings.gitlab['port'] ||= Settings.gitlab.https ? 443 : 80 | 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 | Settings.gitlab['protocol'] ||= Settings.gitlab.https ? "https" : "http" | 56 | Settings.gitlab['protocol'] ||= Settings.gitlab.https ? "https" : "http" |
| 57 | Settings.gitlab['email_from'] ||= "gitlab@#{Settings.gitlab.host}" | 57 | Settings.gitlab['email_from'] ||= "gitlab@#{Settings.gitlab.host}" |
| 58 | Settings.gitlab['support_email'] ||= Settings.gitlab.email_from | 58 | Settings.gitlab['support_email'] ||= Settings.gitlab.email_from |