diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-07-23 19:17:41 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-07-23 19:17:41 +0300 |
| commit | 945dd627fed6b492367262b4aae661bc80e044ba (patch) | |
| tree | b93d4abacfe62fac63e17113c458b672ff042abc | |
| parent | ed234e344e63cb76609c7877235ee5408afea21c (diff) | |
| parent | 69dc5461c3fda2fd447f556c6237c2594c182e71 (diff) | |
| download | gitlab-ce-945dd627fed6b492367262b4aae661bc80e044ba.tar.gz | |
Merge pull request #7332 from sugarmo/fix-graph-log-timeout
Fix timeout error when preparing git graph.
| -rw-r--r-- | app/models/repository.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/repository.rb b/app/models/repository.rb index 89bf12ce9ef..2ff70c248dc 100644 --- a/app/models/repository.rb +++ b/app/models/repository.rb @@ -134,7 +134,7 @@ class Repository def graph_log 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 end end |