diff options
| author | Nick Thomas <nick@gitlab.com> | 2019-03-15 13:09:03 +0000 |
|---|---|---|
| committer | Nick Thomas <nick@gitlab.com> | 2019-03-15 13:09:03 +0000 |
| commit | 76f94da99d4f7973edf22c1fa1962ffd7b95f8bf (patch) | |
| tree | 9ee68035bbbf9b6e397554a230bdf01684870d2a | |
| parent | 7adf10e1869f13a1a66c7db5d403f3cfdccc8560 (diff) | |
| parent | 697cb6f627ed4900c59d008d34f6399c18f33bfc (diff) | |
| download | gitlab-ce-76f94da99d4f7973edf22c1fa1962ffd7b95f8bf.tar.gz | |
Merge branch '56015-remove-remote-timeout' into 'master'
Remove timeout for GitalyClient remove_remote
Closes #56015
See merge request gitlab-org/gitlab-ce!26213
| -rw-r--r-- | changelogs/unreleased/56015-remove-remote-timeout.yml | 5 | ||||
| -rw-r--r-- | lib/gitlab/gitaly_client/remote_service.rb | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/changelogs/unreleased/56015-remove-remote-timeout.yml b/changelogs/unreleased/56015-remove-remote-timeout.yml new file mode 100644 index 00000000000..9b40ada5291 --- /dev/null +++ b/changelogs/unreleased/56015-remove-remote-timeout.yml @@ -0,0 +1,5 @@ +--- +title: Fix removing remote mirror failure which leaves unnecessary refs behind +merge_request: 26213 +author: +type: fixed diff --git a/lib/gitlab/gitaly_client/remote_service.rb b/lib/gitlab/gitaly_client/remote_service.rb index 81fac37ee68..f3589fea39f 100644 --- a/lib/gitlab/gitaly_client/remote_service.rb +++ b/lib/gitlab/gitaly_client/remote_service.rb @@ -38,7 +38,7 @@ module Gitlab def remove_remote(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 end |