Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
351b0e75
Commit
351b0e75
authored
Oct 21, 2012
by
randx
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Log OutOfMemory exceptions from Merge Requests with GitLogger
parent
fb903de5
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
0 deletions
+2
-0
lib/gitlab/merge.rb
lib/gitlab/merge.rb
+2
-0
No files found.
lib/gitlab/merge.rb
View file @
351b0e75
...
@@ -65,6 +65,8 @@ module Gitlab
...
@@ -65,6 +65,8 @@ module Gitlab
end
end
end
end
end
end
rescue
Errno
::
ENOMEM
=>
ex
Gitlab
::
GitLogger
.
error
(
ex
.
message
)
rescue
Grit
::
Git
::
GitTimeout
rescue
Grit
::
Git
::
GitTimeout
return
false
return
false
end
end
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment