diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-02 15:06:12 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-02 15:06:12 +0000 |
| commit | 4f4dcd3c5d7a15b7eab5fa28e27482fa68c750a3 (patch) | |
| tree | 75e1d73289b774a909461007406eb22b33989265 /lib/gitlab/gitaly_client.rb | |
| parent | 2cf5eb1498d6613523b39a829eb00f76df17e781 (diff) | |
| download | gitlab-ce-4f4dcd3c5d7a15b7eab5fa28e27482fa68c750a3.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/gitaly_client.rb')
| -rw-r--r-- | lib/gitlab/gitaly_client.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/gitaly_client.rb b/lib/gitlab/gitaly_client.rb index c4eb3ad770a..befcc004ee4 100644 --- a/lib/gitlab/gitaly_client.rb +++ b/lib/gitlab/gitaly_client.rb @@ -365,7 +365,7 @@ module Gitlab if Sidekiq.server? 6.hours else - 55.seconds + default_timeout end end |