diff options
| author | Nick Thomas <nick@gitlab.com> | 2019-04-15 18:34:54 +0300 |
|---|---|---|
| committer | Nick Thomas <nick@gitlab.com> | 2019-04-15 18:34:54 +0300 |
| commit | 95bbcf082970ae72d3bac814101803e4118db47e (patch) | |
| tree | d75a2b20426d04211ec0adae40147e51e16828b0 /lib | |
| parent | 6e3c9bee8bf09b2dd842e4e017e6f58c23dad32b (diff) | |
| parent | 75ec347d4499b98f27aa1f712258e7fac25fab15 (diff) | |
Merge branch 'zj-fsck-no-timeout' into 'master'
Git FSCK has no timeout
Closes #53319
See merge request gitlab-org/gitlab-ce!27299
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/gitaly_client/repository_service.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/gitaly_client/repository_service.rb b/lib/gitlab/gitaly_client/repository_service.rb index a08bfd0e25b..74aae4a8e97 100644 --- a/lib/gitlab/gitaly_client/repository_service.rb +++ b/lib/gitlab/gitaly_client/repository_service.rb @@ -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 |