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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
ca0f1078
Commit
ca0f1078
authored
Feb 03, 2015
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'webhook-rescue' into 'master'
Webhook rescue Errno::ECONNRESET Fixes #1821 See merge request !1466
parents
46dd5fc4
a89d7adf
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
1 deletion
+1
-1
app/models/hooks/web_hook.rb
app/models/hooks/web_hook.rb
+1
-1
No files found.
app/models/hooks/web_hook.rb
View file @
ca0f1078
...
@@ -48,7 +48,7 @@ class WebHook < ActiveRecord::Base
...
@@ -48,7 +48,7 @@ class WebHook < ActiveRecord::Base
verify:
false
,
verify:
false
,
basic_auth:
auth
)
basic_auth:
auth
)
end
end
rescue
SocketError
,
Errno
::
ECONNREFUSED
,
Net
::
OpenTimeout
=>
e
rescue
SocketError
,
Errno
::
ECONNRE
SET
,
Errno
::
ECONNRE
FUSED
,
Net
::
OpenTimeout
=>
e
logger
.
error
(
"WebHook Error =>
#{
e
}
"
)
logger
.
error
(
"WebHook Error =>
#{
e
}
"
)
false
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