Log OutOfMemory exceptions from Merge Requests with GitLogger

randx
1 parent fb903de5
Showing 1 changed file with 2 additions and 0 deletions Show diff stats
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
...	...	@@ -65,6 +65,8 @@ module Gitlab
65	65	end
66	66	end
67	67	end
	68	+ rescue Errno::ENOMEM => ex
	69	+ Gitlab::GitLogger.error(ex.message)
68	70	rescue Grit::Git::GitTimeout
69	71	return false
70	72	end
...	...