Commit 4d3aac3c authored by Jan Provaznik's avatar Jan Provaznik

Merge branch 'jv-gitaly-long-timeout' into 'master'

Outside Sidekiq, Gitaly long timeout = default timeout

Closes #32754

See merge request gitlab-org/gitlab!17940
parents fd4f7867 8abfa9fc
......@@ -365,7 +365,7 @@ module Gitlab
if Sidekiq.server?
6.hours
else
55.seconds
default_timeout
end
end
......
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