Commit 945dd627 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge pull request #7332 from sugarmo/fix-graph-log-timeout

Fix timeout error when preparing git graph.
parents ed234e34 69dc5461
...@@ -134,7 +134,7 @@ class Repository ...@@ -134,7 +134,7 @@ class Repository
def graph_log def graph_log
Rails.cache.fetch(cache_key(:graph_log)) do Rails.cache.fetch(cache_key(:graph_log)) do
stats = Gitlab::Git::GitStats.new(raw, root_ref) stats = Gitlab::Git::GitStats.new(raw, root_ref, Gitlab.config.git.timeout)
stats.parsed_log stats.parsed_log
end end
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