diff options
| author | Douwe Maan <douwe@selenight.nl> | 2018-05-04 15:47:47 +0300 |
|---|---|---|
| committer | Douwe Maan <douwe@selenight.nl> | 2018-05-04 15:48:01 +0300 |
| commit | 5d003f3d1dfcc5f743c6c1bcd17e84bf4646bf78 (patch) | |
| tree | bdf568ac71985f71db7c2107688f304104d853e8 /app/services/web_hook_service.rb | |
| parent | 073c1a0e73ee515d1e87178a3f9d7905c11f6d31 (diff) | |
Ensure web hook 'blocked URL' errors are stored in as web hook logs and properly surfaced to the user
Diffstat (limited to 'app/services/web_hook_service.rb')
| -rw-r--r-- | app/services/web_hook_service.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/services/web_hook_service.rb b/app/services/web_hook_service.rb index 809ce1303d8..7ec52b6ce2b 100644 --- a/app/services/web_hook_service.rb +++ b/app/services/web_hook_service.rb @@ -41,7 +41,7 @@ class WebHookService http_status: response.code, message: response.to_s } - rescue SocketError, OpenSSL::SSL::SSLError, Errno::ECONNRESET, Errno::ECONNREFUSED, Errno::EHOSTUNREACH, Net::OpenTimeout, Net::ReadTimeout => e + rescue SocketError, OpenSSL::SSL::SSLError, Errno::ECONNRESET, Errno::ECONNREFUSED, Errno::EHOSTUNREACH, Net::OpenTimeout, Net::ReadTimeout, Gitlab::HTTP::BlockedUrlError => e log_execution( trigger: hook_name, url: hook.url, |