diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2018-08-03 11:48:27 +0300 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2018-08-03 11:48:27 +0300 |
| commit | 9db5245153aaf41cfd0186db60e1fb9f4e0d530f (patch) | |
| tree | 4bedb1b7cb17fc6e412f6c0f58a8f21930556ffb /lib | |
| parent | 5b663ddf4c0da4f8f2aa0a48809cda9757042e64 (diff) | |
| parent | c7bf366063dc36b5b23e9624d672963b52836613 (diff) | |
Merge branch 'zj-no-timeout-delete-refs' into 'master'
Set default timeout for deleting many refs
Closes #49862
See merge request gitlab-org/gitlab-ce!20974
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/gitaly_client/ref_service.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/gitaly_client/ref_service.rb b/lib/gitlab/gitaly_client/ref_service.rb index fbe7d4ba1ae..41d58192818 100644 --- a/lib/gitlab/gitaly_client/ref_service.rb +++ b/lib/gitlab/gitaly_client/ref_service.rb @@ -166,7 +166,7 @@ module Gitlab except_with_prefix: except_with_prefixes.map { |r| encode_binary(r) } ) - response = GitalyClient.call(@repository.storage, :ref_service, :delete_refs, request, timeout: GitalyClient.fast_timeout) + response = GitalyClient.call(@repository.storage, :ref_service, :delete_refs, request, timeout: GitalyClient.default_timeout) raise Gitlab::Git::Repository::GitError, response.git_error if response.git_error.present? end |