summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2012-12-24 21:29:53 +0200
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2012-12-24 21:29:53 +0200
commit49e73f8ac1f9b9dabc900a56e98a1cc83b40dc49 (patch)
tree7f58b8361911f5597163a5cbe5f40fc6e6628ebe /config
parent6570843f84674ebba7ff84bc2983c077879ca830 (diff)
downloadgitlab-ce-49e73f8ac1f9b9dabc900a56e98a1cc83b40dc49.tar.gz
Fixed syntax error in config -> settings
Diffstat (limited to 'config')
-rw-r--r--config/initializers/1_settings.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb
index fd61b949d28..efc81611835 100644
--- a/config/initializers/1_settings.rb
+++ b/config/initializers/1_settings.rb
@@ -74,4 +74,4 @@ Settings.backup['path'] = File.expand_path(Settings.backup['path'] || "t
Settings['git'] ||= Settingslogic.new({})
Settings.git['max_size'] ||= 5242880 # 5.megabytes
Settings.git['bin_path'] ||= '/usr/bin/git'
-Settings.git['timeout'] ||= Settings.git_timeout : 10
+Settings.git['timeout'] ||= 10