Commit 5af7fd59 authored by Douwe Maan's avatar Douwe Maan

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
parents 7275c225 b37cea6e
...@@ -142,7 +142,7 @@ module Gitlab ...@@ -142,7 +142,7 @@ module Gitlab
:repository_service, :repository_service,
:is_rebase_in_progress, :is_rebase_in_progress,
request, request,
timeout: GitalyClient.default_timeout timeout: GitalyClient.fast_timeout
) )
response.in_progress response.in_progress
...@@ -159,7 +159,7 @@ module Gitlab ...@@ -159,7 +159,7 @@ module Gitlab
:repository_service, :repository_service,
:is_squash_in_progress, :is_squash_in_progress,
request, request,
timeout: GitalyClient.default_timeout timeout: GitalyClient.fast_timeout
) )
response.in_progress response.in_progress
......
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