diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-05-11 16:34:00 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2016-05-11 16:34:00 +0000 |
| commit | d8415389de859a0dab6e9efa7d8651577631aa7e (patch) | |
| tree | dd3952c1d45ae738f673b705d672ff21199496ca /app/models/hooks | |
| parent | 51a8619a71cd8416db5a66cfbe2a5aa118bbef36 (diff) | |
| parent | ebf80db3abcaf4a0e08273bf180aa33368610b8a (diff) | |
| download | gitlab-ce-d8415389de859a0dab6e9efa7d8651577631aa7e.tar.gz | |
Merge branch 'hook-docs-behavior' into 'master'
Improve documentation and web test for web hooks
Tips and documentation of actual hook behavior. Improved user feedback
when testing hooks via the web UI.
See merge request !4015
Diffstat (limited to 'app/models/hooks')
| -rw-r--r-- | app/models/hooks/web_hook.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/hooks/web_hook.rb b/app/models/hooks/web_hook.rb index fde05f729dc..8b87b6c3d64 100644 --- a/app/models/hooks/web_hook.rb +++ b/app/models/hooks/web_hook.rb @@ -38,7 +38,7 @@ class WebHook < ActiveRecord::Base basic_auth: auth) end - [(response.code >= 200 && response.code < 300), ActionView::Base.full_sanitizer.sanitize(response.to_s)] + [response.code, response.to_s] rescue SocketError, OpenSSL::SSL::SSLError, Errno::ECONNRESET, Errno::ECONNREFUSED, Net::OpenTimeout => e logger.error("WebHook Error => #{e}") [false, e.to_s] |