Add latest changes from gitlab-org/gitlab@master

3 files changed, 4 insertions, 4 deletions

diff --git a/spec/support/shared_examples/ci/auto_merge_merge_requests_examples.rb b/spec/support/shared_examples/ci/auto_merge_merge_requests_shared_examples.rb
index c11448ffe0f..9024845c325 100644
--- a/spec/support/shared_examples/ci/auto_merge_merge_requests_examples.rb
+++ b/spec/support/shared_examples/ci/auto_merge_merge_requests_shared_examples.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-shared_examples 'aborted merge requests for MWPS' do
+RSpec.shared_examples 'aborted merge requests for MWPS' do
   let(:aborted_message) do
     /aborted the automatic merge because target branch was updated/
   end
@@ -23,7 +23,7 @@ shared_examples 'aborted merge requests for MWPS' do
   end
 end
 
-shared_examples 'maintained merge requests for MWPS' do
+RSpec.shared_examples 'maintained merge requests for MWPS' do
   it 'does not cancel auto merge' do
     expect(merge_request.auto_merge_enabled?).to be_truthy
     expect(merge_request.notes).to be_empty
diff --git a/spec/support/shared_examples/ci/pipeline_email_examples.rb b/spec/support/shared_examples/ci/pipeline_email_shared_examples.rb
index f72d8af3c65..01e453d8fd9 100644
--- a/spec/support/shared_examples/ci/pipeline_email_examples.rb
+++ b/spec/support/shared_examples/ci/pipeline_email_shared_examples.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-shared_examples_for 'correct pipeline information for pipelines for merge requests' do
+RSpec.shared_examples 'correct pipeline information for pipelines for merge requests' do
   context 'when pipeline for merge request' do
     let(:pipeline) { merge_request.all_pipelines.first }
 
diff --git a/spec/support/shared_examples/ci/stage_shared_examples.rb b/spec/support/shared_examples/ci/stage_shared_examples.rb
index 925974ed11e..a2849e00d27 100644
--- a/spec/support/shared_examples/ci/stage_shared_examples.rb
+++ b/spec/support/shared_examples/ci/stage_shared_examples.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-shared_examples 'manual playable stage' do |stage_type|
+RSpec.shared_examples 'manual playable stage' do |stage_type|
   let(:stage) { build(stage_type, status: status) }
 
   describe '#manual_playable?' do