diff options
| author | Mike Lewis <mlewis@gitlab.com> | 2019-06-07 20:13:17 +0000 |
|---|---|---|
| committer | Mike Lewis <mlewis@gitlab.com> | 2019-06-07 20:13:17 +0000 |
| commit | 99df0218f82b851b017bd0eea1b8351dc89df6ed (patch) | |
| tree | b01f884fbd1418dd5465fc1741f1620061ae8c5c /lib/gitlab/gitaly_client/remote_service.rb | |
| parent | 3eea6906747d10bea501426febaf15d2c209e06a (diff) | |
| parent | e07b2b277f79bc25cdce22ca2defba1ba80791aa (diff) | |
| download | gitlab-ce-99df0218f82b851b017bd0eea1b8351dc89df6ed.tar.gz | |
Merge branch 'master' into 'docs/fix-example-dot-net'
# Conflicts:
# doc/user/project/clusters/serverless/index.md
Diffstat (limited to 'lib/gitlab/gitaly_client/remote_service.rb')
| -rw-r--r-- | lib/gitlab/gitaly_client/remote_service.rb | 2 |
1 files changed, 1 insertions, 1 deletions
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 |