From 351b0e758b10f482e180395639dee2210d734dec Mon Sep 17 00:00:00 2001 From: randx Date: Sun, 21 Oct 2012 20:29:19 +0300 Subject: [PATCH] Log OutOfMemory exceptions from Merge Requests with GitLogger --- lib/gitlab/merge.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/gitlab/merge.rb b/lib/gitlab/merge.rb index 51a71e55f..bf7aaa516 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 -- 2.11.0