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, 7 insertions, 7 deletions

diff --git a/spec/support/shared_examples/requests/api/custom_attributes_shared_examples.rb b/spec/support/shared_examples/requests/api/custom_attributes_shared_examples.rb
index c9302f7b750..6bc39f2f279 100644
--- a/spec/support/shared_examples/requests/api/custom_attributes_shared_examples.rb
+++ b/spec/support/shared_examples/requests/api/custom_attributes_shared_examples.rb
@@ -9,7 +9,7 @@ shared_examples 'custom attributes endpoints' do |attributable_name|
       it 'does not filter by custom attributes' do
         get api("/#{attributable_name}", user), custom_attributes: { foo: 'foo', bar: 'bar' }
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response.size).to be 2
       end
     end
@@ -17,7 +17,7 @@ shared_examples 'custom attributes endpoints' do |attributable_name|
     it 'filters by custom attributes' do
       get api("/#{attributable_name}", admin), custom_attributes: { foo: 'foo', bar: 'bar' }
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(json_response.size).to be 1
       expect(json_response.first['id']).to eq attributable.id
     end
@@ -33,7 +33,7 @@ shared_examples 'custom attributes endpoints' do |attributable_name|
     it 'returns all custom attributes' do
       get api("/#{attributable_name}/#{attributable.id}/custom_attributes", admin)
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(json_response).to contain_exactly(
         { 'key' => 'foo', 'value' => 'foo' },
         { 'key' => 'bar', 'value' => 'bar' }
@@ -51,7 +51,7 @@ shared_examples 'custom attributes endpoints' do |attributable_name|
     it 'returns a single custom attribute' do
       get api("/#{attributable_name}/#{attributable.id}/custom_attributes/foo", admin)
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(json_response).to eq({ 'key' => 'foo', 'value' => 'foo' })
     end
   end
@@ -68,7 +68,7 @@ shared_examples 'custom attributes endpoints' do |attributable_name|
         put api("/#{attributable_name}/#{attributable.id}/custom_attributes/new", admin), value: 'new'
       end.to change { attributable.custom_attributes.count }.by(1)
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(json_response).to eq({ 'key' => 'new', 'value' => 'new' })
       expect(attributable.custom_attributes.find_by(key: 'new').value).to eq 'new'
     end
@@ -78,7 +78,7 @@ shared_examples 'custom attributes endpoints' do |attributable_name|
         put api("/#{attributable_name}/#{attributable.id}/custom_attributes/foo", admin), value: 'new'
       end.not_to change { attributable.custom_attributes.count }
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(json_response).to eq({ 'key' => 'foo', 'value' => 'new' })
       expect(custom_attribute1.reload.value).to eq 'new'
     end
@@ -96,7 +96,7 @@ shared_examples 'custom attributes endpoints' do |attributable_name|
         delete api("/#{attributable_name}/#{attributable.id}/custom_attributes/foo", admin)
       end.to change { attributable.custom_attributes.count }.by(-1)
 
-      expect(response).to have_http_status(204)
+      expect(response).to have_gitlab_http_status(204)
       expect(attributable.custom_attributes.find_by(key: 'foo')).to be_nil
     end
   end