Merge branch 'master' into 'es-module-autosave'es-module-autosave

# Conflicts:
#   app/assets/javascripts/issuable_form.js
#   app/assets/javascripts/notes.js

1 files changed, 13 insertions, 13 deletions

diff --git a/spec/requests/api/v3/deploy_keys_spec.rb b/spec/requests/api/v3/deploy_keys_spec.rb
index 2affd0cfa51..785bc1eb4ba 100644
--- a/spec/requests/api/v3/deploy_keys_spec.rb
+++ b/spec/requests/api/v3/deploy_keys_spec.rb
@@ -46,7 +46,7 @@ describe API::V3::DeployKeys do
       it 'should return array of ssh keys' do
         get v3_api("/projects/#{project.id}/#{path}", admin)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response).to be_an Array
         expect(json_response.first['title']).to eq(deploy_key.title)
       end
@@ -56,14 +56,14 @@ describe API::V3::DeployKeys do
       it 'should return a single key' do
         get v3_api("/projects/#{project.id}/#{path}/#{deploy_key.id}", admin)
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response['title']).to eq(deploy_key.title)
       end
 
       it 'should return 404 Not Found with invalid ID' do
         get v3_api("/projects/#{project.id}/#{path}/404", admin)
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
     end
 
@@ -71,14 +71,14 @@ describe API::V3::DeployKeys do
       it 'should not create an invalid ssh key' do
         post v3_api("/projects/#{project.id}/#{path}", admin), { title: 'invalid key' }
 
-        expect(response).to have_http_status(400)
+        expect(response).to have_gitlab_http_status(400)
         expect(json_response['error']).to eq('key is missing')
       end
 
       it 'should not create a key without title' do
         post v3_api("/projects/#{project.id}/#{path}", admin), key: 'some key'
 
-        expect(response).to have_http_status(400)
+        expect(response).to have_gitlab_http_status(400)
         expect(json_response['error']).to eq('title is missing')
       end
 
@@ -95,7 +95,7 @@ describe API::V3::DeployKeys do
           post v3_api("/projects/#{project.id}/#{path}", admin), { key: deploy_key.key, title: deploy_key.title }
         end.not_to change { project.deploy_keys.count }
 
-        expect(response).to have_http_status(201)
+        expect(response).to have_gitlab_http_status(201)
       end
 
       it 'joins an existing ssh key to a new project' do
@@ -103,7 +103,7 @@ describe API::V3::DeployKeys do
           post v3_api("/projects/#{project2.id}/#{path}", admin), { key: deploy_key.key, title: deploy_key.title }
         end.to change { project2.deploy_keys.count }.by(1)
 
-        expect(response).to have_http_status(201)
+        expect(response).to have_gitlab_http_status(201)
       end
 
       it 'accepts can_push parameter' do
@@ -111,7 +111,7 @@ describe API::V3::DeployKeys do
 
         post v3_api("/projects/#{project.id}/#{path}", admin), key_attrs
 
-        expect(response).to have_http_status(201)
+        expect(response).to have_gitlab_http_status(201)
         expect(json_response['can_push']).to eq(true)
       end
     end
@@ -128,7 +128,7 @@ describe API::V3::DeployKeys do
       it 'should return 404 Not Found with invalid ID' do
         delete v3_api("/projects/#{project.id}/#{path}/404", admin)
 
-        expect(response).to have_http_status(404)
+        expect(response).to have_gitlab_http_status(404)
       end
     end
 
@@ -141,7 +141,7 @@ describe API::V3::DeployKeys do
             post v3_api("/projects/#{project2.id}/#{path}/#{deploy_key.id}/enable", admin)
           end.to change { project2.deploy_keys.count }.from(0).to(1)
 
-          expect(response).to have_http_status(201)
+          expect(response).to have_gitlab_http_status(201)
           expect(json_response['id']).to eq(deploy_key.id)
         end
       end
@@ -150,7 +150,7 @@ describe API::V3::DeployKeys do
         it 'should return a 404 error' do
           post v3_api("/projects/#{project2.id}/#{path}/#{deploy_key.id}/enable", user)
 
-          expect(response).to have_http_status(404)
+          expect(response).to have_gitlab_http_status(404)
         end
       end
     end
@@ -162,7 +162,7 @@ describe API::V3::DeployKeys do
             delete v3_api("/projects/#{project.id}/#{path}/#{deploy_key.id}/disable", admin)
           end.to change { project.deploy_keys.count }.from(1).to(0)
 
-          expect(response).to have_http_status(200)
+          expect(response).to have_gitlab_http_status(200)
           expect(json_response['id']).to eq(deploy_key.id)
         end
       end
@@ -171,7 +171,7 @@ describe API::V3::DeployKeys do
         it 'should return a 404 error' do
           delete v3_api("/projects/#{project.id}/#{path}/#{deploy_key.id}/disable", user)
 
-          expect(response).to have_http_status(404)
+          expect(response).to have_gitlab_http_status(404)
         end
       end
     end