diff options
| author | randx <dmitriy.zaporozhets@gmail.com> | 2012-08-11 15:59:36 +0300 |
|---|---|---|
| committer | randx <dmitriy.zaporozhets@gmail.com> | 2012-08-11 15:59:36 +0300 |
| commit | 731b6be9c929d9117c322c605a7f53a8319751cd (patch) | |
| tree | 42de1835fbbda6ddec70cdb234ff6cfe13b92004 /app/controllers | |
| parent | ac525a74ee2862d0012a443059954288d4634acd (diff) | |
| download | gitlab-ce-731b6be9c929d9117c322c605a7f53a8319751cd.tar.gz | |
Handle app crash on huge commits
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/commits_controller.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/app/controllers/commits_controller.rb b/app/controllers/commits_controller.rb index 861fc3245a9..717912d9e92 100644 --- a/app/controllers/commits_controller.rb +++ b/app/controllers/commits_controller.rb @@ -41,8 +41,9 @@ class CommitsController < ApplicationController return git_not_found! end - rescue Grit::Git::GitTimeout - render "huge_commit" + if result[:status] == :huge_commit + render "huge_commit" and return + end end def compare |