summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-04-23 16:19:59 +0200
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-04-23 16:19:59 +0200
commit2134e18ec64222e60aa0d8947a5d9e265c6e4975 (patch)
tree09f4b9b5d675afb627c4534b49bfd18ca9f703d9
parent7c5b61224a040ed6489633ab5efd033c26bd2469 (diff)
downloadgitlab-ce-2134e18ec64222e60aa0d8947a5d9e265c6e4975.tar.gz
Fix default ssh_host setting
-rw-r--r--config/initializers/1_settings.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb
index ee1b7ebf3f3..c4e1c352e5e 100644
--- a/config/initializers/1_settings.rb
+++ b/config/initializers/1_settings.rb
@@ -73,6 +73,7 @@ Settings.gitlab['default_projects_limit'] ||= 10
Settings.gitlab['default_can_create_group'] = true if Settings.gitlab['default_can_create_group'].nil?
Settings.gitlab['default_theme'] = Gitlab::Theme::MARS if Settings.gitlab['default_theme'].nil?
Settings.gitlab['host'] ||= 'localhost'
+Settings.gitlab['ssh_host'] ||= 'localhost'
Settings.gitlab['https'] = false if Settings.gitlab['https'].nil?
Settings.gitlab['port'] ||= Settings.gitlab.https ? 443 : 80
Settings.gitlab['relative_url_root'] ||= ENV['RAILS_RELATIVE_URL_ROOT'] || ''