diff options
| author | randx <dmitriy.zaporozhets@gmail.com> | 2012-10-21 21:29:19 +0400 |
|---|---|---|
| committer | randx <dmitriy.zaporozhets@gmail.com> | 2012-10-21 21:29:19 +0400 |
| commit | 351b0e758b10f482e180395639dee2210d734dec (patch) | |
| tree | 43c755e2130cb1688700b0cd90d7ac62947accd8 | |
| parent | fb903de50828ca01c533e5f02527623ff27a253b (diff) | |
Log OutOfMemory exceptions from Merge Requests with GitLogger
| -rw-r--r-- | lib/gitlab/merge.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/gitlab/merge.rb b/lib/gitlab/merge.rb index 51a71e55f03..bf7aaa516f1 100644 --- a/lib/gitlab/merge.rb +++ b/lib/gitlab/merge.rb @@ -65,6 +65,8 @@ module Gitlab end end end + rescue Errno::ENOMEM => ex + Gitlab::GitLogger.error(ex.message) rescue Grit::Git::GitTimeout return false end |