Commit 9db52451 authored by Sean McGivern's avatar Sean McGivern

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
parents 5b663ddf c7bf3660
...@@ -166,7 +166,7 @@ module Gitlab ...@@ -166,7 +166,7 @@ module Gitlab
except_with_prefix: except_with_prefixes.map { |r| encode_binary(r) } 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? raise Gitlab::Git::Repository::GitError, response.git_error if response.git_error.present?
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment