Automatic merge of gitlab-org/gitlab-ce master

Gemfile

@@ -392,7 +392,7 @@ group :test do
   gem 'shoulda-matchers', '~> 3.1.2', require: false
   gem 'email_spec', '~> 2.2.0'
   gem 'json-schema', '~> 2.8.0'
-  gem 'webmock', '~> 2.3.2'
+  gem 'webmock', '~> 3.5.1'
   gem 'rails-controller-testing'
   gem 'sham_rack', '~> 1.3.6'
   gem 'concurrent-ruby', '~> 1.1'

Gemfile.lock

@@ -384,7 +384,7 @@ GEM
       thor
       tilt
     hangouts-chat (0.0.5)
-    hashdiff (0.3.4)
+    hashdiff (0.3.8)
     hashie (3.5.7)
     hashie-forbidden_attributes (0.1.1)
       hashie (>= 3.0)
@@ -955,7 +955,7 @@ GEM
     vmstat (2.3.0)
     warden (1.2.7)
       rack (>= 1.0)
-    webmock (2.3.2)
+    webmock (3.5.1)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff
@@ -1214,7 +1214,7 @@ DEPENDENCIES
   version_sorter (~> 2.1.0)
   virtus (~> 1.0.1)
   vmstat (~> 2.3.0)
-  webmock (~> 2.3.2)
+  webmock (~> 3.5.1)
   webpack-rails (~> 0.9.10)
   wikicloth (= 0.8.1)
 

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

spec/lib/bitbucket_server/client_spec.rb

@@ -64,7 +64,7 @@ describe BitbucketServer::Client do
     let(:url) { "#{base_uri}rest/api/1.0/projects/SOME-PROJECT/repos/my-repo/branches" }
 
     it 'requests Bitbucket to create a branch' do
-      stub_request(:post, url).to_return(status: 204, headers: headers, body: '{}')
+      stub_request(:post, url).to_return(status: 204, headers: headers, body: nil)
 
       subject.create_branch(project, repo_slug, branch, sha)
 
@@ -78,7 +78,7 @@ describe BitbucketServer::Client do
     let(:url) { "#{base_uri}rest/branch-utils/1.0/projects/SOME-PROJECT/repos/my-repo/branches" }
 
     it 'requests Bitbucket to create a branch' do
-      stub_request(:delete, url).to_return(status: 204, headers: headers, body: '{}')
+      stub_request(:delete, url).to_return(status: 204, headers: headers, body: nil)
 
       subject.delete_branch(project, repo_slug, branch, sha)