Commit 32d6426b authored by Ash McKenzie's avatar Ash McKenzie

Merge branch 'jira-test-fix' into 'master'

Add Gitlab::HTTP::BlockedUrlError to rescued

See merge request gitlab-org/gitlab!34445
parents 8f78afdd 6ef2a0ee
...@@ -414,7 +414,7 @@ class JiraService < IssueTrackerService ...@@ -414,7 +414,7 @@ class JiraService < IssueTrackerService
# Handle errors when doing Jira API calls # Handle errors when doing Jira API calls
def jira_request def jira_request
yield yield
rescue Timeout::Error, Errno::EINVAL, Errno::ECONNRESET, Errno::ECONNREFUSED, URI::InvalidURIError, JIRA::HTTPError, OpenSSL::SSL::SSLError => error rescue => error
@error = error @error = error
log_error("Error sending message", client_url: client_url, error: @error.message) log_error("Error sending message", client_url: client_url, error: @error.message)
nil nil
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment