diff options
| author | James Lopez <james@gitlab.com> | 2019-02-20 07:50:34 +0000 |
|---|---|---|
| committer | James Lopez <james@gitlab.com> | 2019-02-20 07:50:34 +0000 |
| commit | 678f55da3e608a1507e451e72540d63f3bacc315 (patch) | |
| tree | 5285f9b2e9cf537ef4a23a52dd618725ec56058d /lib | |
| parent | 8a4cbca2a4e5d42d63ae3999816d4e8a9af228f7 (diff) | |
| parent | a0856cf7b94b76f5305f3dd49f6c2b2cc807ea99 (diff) | |
| download | gitlab-ce-678f55da3e608a1507e451e72540d63f3bacc315.tar.gz | |
Merge branch 'sh-upgrade-webmock-ruby-2.6' into 'master'
Upgrade Webmock to 3.5.1
See merge request gitlab-org/gitlab-ce!25318
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/bitbucket_server/connection.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/bitbucket_server/connection.rb b/lib/bitbucket_server/connection.rb index 9c14b26c65a..fbd451efb23 100644 --- a/lib/bitbucket_server/connection.rb +++ b/lib/bitbucket_server/connection.rb @@ -77,6 +77,7 @@ module BitbucketServer private def check_errors!(response) + return if ActionDispatch::Response::NO_CONTENT_CODES.include?(response.code) raise ConnectionError, "Response is not valid JSON" unless response.parsed_response.is_a?(Hash) return if response.code >= 200 && response.code < 300 |