Add latest changes from gitlab-org/gitlab@master

7 files changed, 8 insertions, 8 deletions

diff --git a/spec/support/shared_examples/services/boards/boards_create_service.rb b/spec/support/shared_examples/services/boards/boards_create_service_shared_examples.rb
index 7fd69354c2d..fced2e59ace 100644
--- a/spec/support/shared_examples/services/boards/boards_create_service.rb
+++ b/spec/support/shared_examples/services/boards/boards_create_service_shared_examples.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-shared_examples 'boards create service' do
+RSpec.shared_examples 'boards create service' do
   context 'when parent does not have a board' do
     it 'creates a new board' do
       expect { service.execute }.to change(Board, :count).by(1)
diff --git a/spec/support/shared_examples/services/boards/boards_list_service.rb b/spec/support/shared_examples/services/boards/boards_list_service_shared_examples.rb
index 18d45ee324a..97fe39a4494 100644
--- a/spec/support/shared_examples/services/boards/boards_list_service.rb
+++ b/spec/support/shared_examples/services/boards/boards_list_service_shared_examples.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-shared_examples 'boards list service' do
+RSpec.shared_examples 'boards list service' do
   context 'when parent does not have a board' do
     it 'creates a new parent board' do
       expect { service.execute }.to change(parent.boards, :count).by(1)
@@ -30,7 +30,7 @@ shared_examples 'boards list service' do
   end
 end
 
-shared_examples 'multiple boards list service' do
+RSpec.shared_examples 'multiple boards list service' do
   let(:service)  { described_class.new(parent, double) }
   let!(:board_B) { create(:board, resource_parent: parent, name: 'B-board') }
   let!(:board_c) { create(:board, resource_parent: parent, name: 'c-board') }
diff --git a/spec/support/shared_examples/services/boards/issues_list_service.rb b/spec/support/shared_examples/services/boards/issues_list_service_shared_examples.rb
index 75733c774ef..56f9e811799 100644
--- a/spec/support/shared_examples/services/boards/issues_list_service.rb
+++ b/spec/support/shared_examples/services/boards/issues_list_service_shared_examples.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-shared_examples 'issues list service' do
+RSpec.shared_examples 'issues list service' do
   it 'delegates search to IssuesFinder' do
     params = { board_id: board.id, id: list1.id }
 
diff --git a/spec/support/shared_examples/services/boards/issues_move_service.rb b/spec/support/shared_examples/services/boards/issues_move_service_shared_examples.rb
index d3fa8084185..f352b430cc7 100644
--- a/spec/support/shared_examples/services/boards/issues_move_service.rb
+++ b/spec/support/shared_examples/services/boards/issues_move_service_shared_examples.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-shared_examples 'issues move service' do |group|
+RSpec.shared_examples 'issues move service' do |group|
   shared_examples 'updating timestamps' do
     it 'updates updated_at' do
       expect {described_class.new(parent, user, params).execute(issue)}
diff --git a/spec/support/shared_examples/services/boards/lists_destroy_service.rb b/spec/support/shared_examples/services/boards/lists_destroy_service_shared_examples.rb
index 95725078f9d..6a4f284ec54 100644
--- a/spec/support/shared_examples/services/boards/lists_destroy_service.rb
+++ b/spec/support/shared_examples/services/boards/lists_destroy_service_shared_examples.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-shared_examples 'lists destroy service' do
+RSpec.shared_examples 'lists destroy service' do
   context 'when list type is label' do
     it 'removes list from board' do
       list = create(:list, board: board)
diff --git a/spec/support/shared_examples/services/boards/lists_list_service.rb b/spec/support/shared_examples/services/boards/lists_list_service_shared_examples.rb
index 29784f6da08..1b7fe626aea 100644
--- a/spec/support/shared_examples/services/boards/lists_list_service.rb
+++ b/spec/support/shared_examples/services/boards/lists_list_service_shared_examples.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-shared_examples 'lists list service' do
+RSpec.shared_examples 'lists list service' do
   context 'when the board has a backlog list' do
     let!(:backlog_list) { create(:backlog_list, board: board) }
 
diff --git a/spec/support/shared_examples/services/boards/lists_move_service.rb b/spec/support/shared_examples/services/boards/lists_move_service_shared_examples.rb
index 0b3bfd8e2a8..bf84b912610 100644
--- a/spec/support/shared_examples/services/boards/lists_move_service.rb
+++ b/spec/support/shared_examples/services/boards/lists_move_service_shared_examples.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-shared_examples 'lists move service' do
+RSpec.shared_examples 'lists move service' do
   let!(:planning)    { create(:list, board: board, position: 0) }
   let!(:development) { create(:list, board: board, position: 1) }
   let!(:review)      { create(:list, board: board, position: 2) }