diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-07-23 19:17:31 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-07-23 19:17:31 +0300 |
| commit | ed234e344e63cb76609c7877235ee5408afea21c (patch) | |
| tree | 34d4f6e230d6da77c1e4e6366e817098452de814 /lib | |
| parent | 136ff572110ec0b9f0a8643acedb0c09b25b18f7 (diff) | |
| parent | 07537faca72e2475a25e1e73c12bc924499afc27 (diff) | |
| download | gitlab-ce-ed234e344e63cb76609c7877235ee5408afea21c.tar.gz | |
Merge pull request #7316 from ayr-ton/master
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 |