diff options
| author | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2017-04-03 16:36:14 -0300 |
|---|---|---|
| committer | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2017-04-03 16:36:14 -0300 |
| commit | ff9eb3042ff75bbb69c2d4a23968dc2f5f988761 (patch) | |
| tree | 52248604f9c0b18b2e08c188b91c4351f942329f /lib | |
| parent | 6143642a5ff2bbc63736b4b05d9583e72527fd5e (diff) | |
| download | gitlab-ce-ff9eb3042ff75bbb69c2d4a23968dc2f5f988761.tar.gz | |
Set the right timeout for Gitlab::Shell#fetch_remote
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/shell.rb | 3 |
1 files changed, 2 insertions, 1 deletions
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 |