diff options
| author | Douwe Maan <douwe@gitlab.com> | 2018-04-30 15:40:11 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2018-04-30 15:40:11 +0000 |
| commit | 5af7fd59e53061700bb2db781711aec0b958253c (patch) | |
| tree | 9ffa4929717e100fdcfd80b48a6272697b5d2e7e | |
| parent | 7275c225f19b5cc75587d4da710885e036b254b6 (diff) | |
| parent | b37cea6e9c6e14d12a8fedbeb80af94364408757 (diff) | |
| download | gitlab-ce-5af7fd59e53061700bb2db781711aec0b958253c.tar.gz | |
Merge branch 'rebase-in-progress-fast-timeout' into 'master'
Use fast timeouts for Gitaly FooInProgress RPC's
See merge request gitlab-org/gitlab-ce!18655
| -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 |