Read about our upcoming Code of Conduct on this issue

Commit 18f4e0bf authored by Douwe Maan's avatar Douwe Maan
Browse files

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
......@@ -142,7 +142,7 @@ def rebase_in_progress?(rebase_id)
:repository_service,
:is_rebase_in_progress,
request,
timeout: GitalyClient.default_timeout
timeout: GitalyClient.fast_timeout
)
response.in_progress
......@@ -159,7 +159,7 @@ def squash_in_progress?(squash_id)
:repository_service,
:is_squash_in_progress,
request,
timeout: GitalyClient.default_timeout
timeout: GitalyClient.fast_timeout
)
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