Commit 2134e18ec64222e60aa0d8947a5d9e265c6e4975
1 parent
7c5b6122
Exists in
spb-stable
and in
2 other branches
Fix default ssh_host setting
Showing
1 changed file
with
1 additions
and
0 deletions
Show diff stats
config/initializers/1_settings.rb
| @@ -73,6 +73,7 @@ Settings.gitlab['default_projects_limit'] ||= 10 | @@ -73,6 +73,7 @@ Settings.gitlab['default_projects_limit'] ||= 10 | ||
| 73 | Settings.gitlab['default_can_create_group'] = true if Settings.gitlab['default_can_create_group'].nil? | 73 | Settings.gitlab['default_can_create_group'] = true if Settings.gitlab['default_can_create_group'].nil? |
| 74 | Settings.gitlab['default_theme'] = Gitlab::Theme::MARS if Settings.gitlab['default_theme'].nil? | 74 | Settings.gitlab['default_theme'] = Gitlab::Theme::MARS if Settings.gitlab['default_theme'].nil? |
| 75 | Settings.gitlab['host'] ||= 'localhost' | 75 | Settings.gitlab['host'] ||= 'localhost' |
| 76 | +Settings.gitlab['ssh_host'] ||= 'localhost' | ||
| 76 | Settings.gitlab['https'] = false if Settings.gitlab['https'].nil? | 77 | Settings.gitlab['https'] = false if Settings.gitlab['https'].nil? |
| 77 | Settings.gitlab['port'] ||= Settings.gitlab.https ? 443 : 80 | 78 | Settings.gitlab['port'] ||= Settings.gitlab.https ? 443 : 80 |
| 78 | Settings.gitlab['relative_url_root'] ||= ENV['RAILS_RELATIVE_URL_ROOT'] || '' | 79 | Settings.gitlab['relative_url_root'] ||= ENV['RAILS_RELATIVE_URL_ROOT'] || '' |