diff options
| author | Robert Speicher <robert@gitlab.com> | 2018-05-04 15:34:14 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2018-05-04 15:34:14 +0000 |
| commit | f8475d9091a8219cec897df542a943835a3b6cca (patch) | |
| tree | 8eab09b48373e6c3aec1e43e5364a0805de3e864 /spec/services | |
| parent | 7603beffc916d06039cac63b223d8e6234b5d666 (diff) | |
| parent | cf76c8575beae985951e12066037db6c34941d19 (diff) | |
| download | gitlab-ce-f8475d9091a8219cec897df542a943835a3b6cca.tar.gz | |
Merge branch 'dm-webhook-catch-blocked-url-exception' into 'master'
Ensure web hook 'blocked URL' errors are stored in as web hook logs and properly surfaced to the user
See merge request gitlab-org/gitlab-ce!18746
Diffstat (limited to 'spec/services')
| -rw-r--r-- | spec/services/web_hook_service_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/services/web_hook_service_spec.rb b/spec/services/web_hook_service_spec.rb index 2ef2e61babc..7995f2c9ae7 100644 --- a/spec/services/web_hook_service_spec.rb +++ b/spec/services/web_hook_service_spec.rb @@ -67,7 +67,7 @@ describe WebHookService do end it 'handles exceptions' do - exceptions = [SocketError, OpenSSL::SSL::SSLError, Errno::ECONNRESET, Errno::ECONNREFUSED, Errno::EHOSTUNREACH, Net::OpenTimeout, Net::ReadTimeout] + exceptions = [SocketError, OpenSSL::SSL::SSLError, Errno::ECONNRESET, Errno::ECONNREFUSED, Errno::EHOSTUNREACH, Net::OpenTimeout, Net::ReadTimeout, Gitlab::HTTP::BlockedUrlError] exceptions.each do |exception_class| exception = exception_class.new('Exception message') |