From 49e73f8ac1f9b9dabc900a56e98a1cc83b40dc49 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Mon, 24 Dec 2012 21:29:53 +0200
Subject: [PATCH] Fixed syntax error in config -> settings

---
 config/initializers/1_settings.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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
-- 
GitLab