Commit 95bbcf08 authored by Nick Thomas's avatar Nick Thomas 馃尨

Merge branch 'zj-fsck-no-timeout' into 'master'

Git FSCK has no timeout

Closes #53319

See merge request gitlab-org/gitlab-ce!27299
parents 6e3c9bee 75ec347d
---
title: Remove deadline for Git fsck
merge_request: 27299
author:
type: fixed
......@@ -190,7 +190,7 @@ module Gitlab
def fsck
request = Gitaly::FsckRequest.new(repository: @gitaly_repo)
response = GitalyClient.call(@storage, :repository_service, :fsck, request)
response = GitalyClient.call(@storage, :repository_service, :fsck, request, timeout: GitalyClient.no_timeout)
if response.error.empty?
return "", 0
......
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