diff options
| author | Ayrton Araújo <root@ayrtonaraujo.net> | 2014-07-15 14:27:35 -0400 |
|---|---|---|
| committer | Ayrton Araújo <root@ayrtonaraujo.net> | 2014-07-21 11:50:29 -0400 |
| commit | 07537faca72e2475a25e1e73c12bc924499afc27 (patch) | |
| tree | c0a3363962b31fd35b85b2a66a74bcc774bb45e5 /lib | |
| parent | a6546f51e2a383d812dd633166447f6758bd9bdb (diff) | |
| download | gitlab-ce-07537faca72e2475a25e1e73c12bc924499afc27.tar.gz | |
Add support to set satellites timeout
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/satellite/action.rb | 2 |
1 files changed, 1 insertions, 1 deletions
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 |