diff options
| author | Jacob Vosmaer <jacob@gitlab.com> | 2018-04-30 14:16:27 +0200 |
|---|---|---|
| committer | Jacob Vosmaer <jacob@gitlab.com> | 2018-04-30 14:16:27 +0200 |
| commit | b37cea6e9c6e14d12a8fedbeb80af94364408757 (patch) | |
| tree | 27e0eb27901e2e466e8527db63f0d24ccc3ab381 | |
| parent | 649f791e054f04512fa42ad0f195a7c75543df98 (diff) | |
| download | gitlab-ce-b37cea6e9c6e14d12a8fedbeb80af94364408757.tar.gz | |
Use fast timeouts for Gitaly FooInProgress RPC's
| -rw-r--r-- | lib/gitlab/gitaly_client/repository_service.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/gitlab/gitaly_client/repository_service.rb b/lib/gitlab/gitaly_client/repository_service.rb index bf5a491e28d..498187997e1 100644 --- a/lib/gitlab/gitaly_client/repository_service.rb +++ b/lib/gitlab/gitaly_client/repository_service.rb @@ -142,7 +142,7 @@ module Gitlab :repository_service, :is_rebase_in_progress, request, - timeout: GitalyClient.default_timeout + timeout: GitalyClient.fast_timeout ) response.in_progress @@ -159,7 +159,7 @@ module Gitlab :repository_service, :is_squash_in_progress, request, - timeout: GitalyClient.default_timeout + timeout: GitalyClient.fast_timeout ) response.in_progress |