Commit 76f94da9 authored by Nick Thomas's avatar Nick Thomas

Merge branch '56015-remove-remote-timeout' into 'master'

Remove timeout for GitalyClient remove_remote

Closes #56015

See merge request gitlab-org/gitlab-ce!26213
parents 7adf10e1 697cb6f6
---
title: Fix removing remote mirror failure which leaves unnecessary refs behind
merge_request: 26213
author:
type: fixed
...@@ -38,7 +38,7 @@ module Gitlab ...@@ -38,7 +38,7 @@ module Gitlab
def remove_remote(name) def remove_remote(name)
request = Gitaly::RemoveRemoteRequest.new(repository: @gitaly_repo, name: name) request = Gitaly::RemoveRemoteRequest.new(repository: @gitaly_repo, name: name)
response = GitalyClient.call(@storage, :remote_service, :remove_remote, request, timeout: GitalyClient.fast_timeout) response = GitalyClient.call(@storage, :remote_service, :remove_remote, request)
response.result response.result
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