Commit 351b0e758b10f482e180395639dee2210d734dec

Authored by randx
1 parent fb903de5

Log OutOfMemory exceptions from Merge Requests with GitLogger

Showing 1 changed file with 2 additions and 0 deletions   Show diff stats
lib/gitlab/merge.rb
@@ -65,6 +65,8 @@ module Gitlab @@ -65,6 +65,8 @@ module Gitlab
65 end 65 end
66 end 66 end
67 end 67 end
  68 + rescue Errno::ENOMEM => ex
  69 + Gitlab::GitLogger.error(ex.message)
68 rescue Grit::Git::GitTimeout 70 rescue Grit::Git::GitTimeout
69 return false 71 return false
70 end 72 end