OSDN Git Service
(root)
/
wvm
/
gitlab.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
fb903de
)
Log OutOfMemory exceptions from Merge Requests with GitLogger
author
randx
<dmitriy.zaporozhets@gmail.com>
Sun, 21 Oct 2012 17:29:19 +0000
(20:29 +0300)
committer
randx
<dmitriy.zaporozhets@gmail.com>
Sun, 21 Oct 2012 17:29:19 +0000
(20:29 +0300)
lib/gitlab/merge.rb
patch
|
blob
|
history
diff --git
a/lib/gitlab/merge.rb
b/lib/gitlab/merge.rb
index
51a71e5
..
bf7aaa5
100644
(file)
--- 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