From ff9eb3042ff75bbb69c2d4a23968dc2f5f988761 Mon Sep 17 00:00:00 2001 From: Douglas Barbosa Alexandre Date: Mon, 3 Apr 2017 16:36:14 -0300 Subject: Set the right timeout for Gitlab::Shell#fetch_remote --- lib/gitlab/shell.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/gitlab/shell.rb b/lib/gitlab/shell.rb index 94073d816e5..2744d627ceb 100644 --- a/lib/gitlab/shell.rb +++ b/lib/gitlab/shell.rb @@ -93,12 +93,13 @@ module Gitlab # name - project path with namespace # remote - remote name # forced - should we use --force flag? + # no_tags - should we use --no-tags flag? # # Ex. # fetch_remote("gitlab/gitlab-ci", "upstream") # def fetch_remote(storage, name, remote, forced: false, no_tags: false) - args = [gitlab_shell_projects_path, 'fetch-remote', storage, "#{name}.git", remote, '2100'] + args = [gitlab_shell_projects_path, 'fetch-remote', storage, "#{name}.git", remote, '800'] args << '--force' if forced args << '--no-tags' if no_tags -- cgit v1.2.1