Add latest changes from gitlab-org/gitlab@master

2 files changed, 4 insertions, 4 deletions

diff --git a/spec/support/shared_examples/serializers/diff_file_entity_examples.rb b/spec/support/shared_examples/serializers/diff_file_entity_shared_examples.rb
index d2c269c597c..db5c4b45b70 100644
--- a/spec/support/shared_examples/serializers/diff_file_entity_examples.rb
+++ b/spec/support/shared_examples/serializers/diff_file_entity_shared_examples.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-shared_examples 'diff file base entity' do
+RSpec.shared_examples 'diff file base entity' do
   it 'exposes essential attributes' do
     expect(subject).to include(:content_sha, :submodule, :submodule_link,
                                :submodule_tree_url, :old_path_html,
@@ -26,7 +26,7 @@ shared_examples 'diff file base entity' do
   end
 end
 
-shared_examples 'diff file entity' do
+RSpec.shared_examples 'diff file entity' do
   it_behaves_like 'diff file base entity'
 
   it 'exposes correct attributes' do
@@ -70,6 +70,6 @@ shared_examples 'diff file entity' do
   end
 end
 
-shared_examples 'diff file discussion entity' do
+RSpec.shared_examples 'diff file discussion entity' do
   it_behaves_like 'diff file base entity'
 end
diff --git a/spec/support/shared_examples/serializers/note_entity_examples.rb b/spec/support/shared_examples/serializers/note_entity_shared_examples.rb
index bfcaa2f1bd5..7b2ec02c7b6 100644
--- a/spec/support/shared_examples/serializers/note_entity_examples.rb
+++ b/spec/support/shared_examples/serializers/note_entity_shared_examples.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-shared_examples 'note entity' do
+RSpec.shared_examples 'note entity' do
   subject { entity.as_json }
 
   context 'basic note' do