From 07537faca72e2475a25e1e73c12bc924499afc27 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ayrton=20Ara=C3=BAjo?= <root@ayrtonaraujo.net>
Date: Tue, 15 Jul 2014 14:27:35 -0400
Subject: Add support to set satellites timeout

---
 lib/gitlab/satellite/action.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/gitlab/satellite/action.rb b/lib/gitlab/satellite/action.rb
index 5ea6f956765..be45cb5c98e 100644
--- a/lib/gitlab/satellite/action.rb
+++ b/lib/gitlab/satellite/action.rb
@@ -1,7 +1,7 @@
 module Gitlab
   module Satellite
     class Action
-      DEFAULT_OPTIONS = { git_timeout: 30.seconds }
+      DEFAULT_OPTIONS = { git_timeout: Gitlab.config.satellites.timeout.seconds }
 
       attr_accessor :options, :project, :user
 
-- 
cgit v1.2.1