From 4f4dcd3c5d7a15b7eab5fa28e27482fa68c750a3 Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Wed, 2 Oct 2019 15:06:12 +0000
Subject: Add latest changes from gitlab-org/gitlab@master

---
 lib/gitlab/gitaly_client.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/gitlab/gitaly_client.rb')

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
 
-- 
cgit v1.2.1