summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-06-11 23:37:21 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-06-11 23:37:21 +0300
commit56f0f6aba399d85c6e99e69c57a18a040bad4cf3 (patch)
tree0ef9cb59c6993d4f1c7afc8c3ddb62a344cc3084 /lib
parent7ed935b6765ed1e9de810cfdf8ac9f6eb3fb741d (diff)
downloadgitlab-ce-56f0f6aba399d85c6e99e69c57a18a040bad4cf3.tar.gz
Use same 30 seconds satellite timeout for all actions
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'lib')
-rw-r--r--lib/gitlab/satellite/files/file_action.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/satellite/files/file_action.rb b/lib/gitlab/satellite/files/file_action.rb
index 7701a6d5d60..6446b14568a 100644
--- a/lib/gitlab/satellite/files/file_action.rb
+++ b/lib/gitlab/satellite/files/file_action.rb
@@ -4,7 +4,7 @@ module Gitlab
attr_accessor :file_path, :ref
def initialize(user, project, ref, file_path)
- super user, project, git_timeout: 10.seconds
+ super user, project
@file_path = file_path
@ref = ref
end