Add latest changes from gitlab-org/gitlab@master

1 files changed, 0 insertions, 14 deletions

diff --git a/spec/features/merge_requests/user_mass_updates_spec.rb b/spec/features/merge_requests/user_mass_updates_spec.rb
index fa866beb773..cf9760bcd7f 100644
--- a/spec/features/merge_requests/user_mass_updates_spec.rb
+++ b/spec/features/merge_requests/user_mass_updates_spec.rb
@@ -9,8 +9,6 @@ RSpec.describe 'Merge requests > User mass updates', :js do
   let!(:merge_request) { create(:merge_request, source_project: project, target_project: project) }
 
   before do
-    stub_feature_flags(mr_attention_requests: false)
-
     project.add_maintainer(user)
     project.add_maintainer(user2)
     sign_in(user)
@@ -63,18 +61,6 @@ RSpec.describe 'Merge requests > User mass updates', :js do
 
         expect(find('.merge-request')).to have_link "Assigned to #{user.name}"
       end
-
-      describe 'with attention requests feature flag on' do
-        before do
-          stub_feature_flags(mr_attention_requests: true)
-        end
-
-        it 'updates merge request with assignee' do
-          change_assignee(user2.name)
-
-          expect(find('.issuable-meta a.author-link')[:title]).to eq "Attention requested from assignee #{user2.name}"
-        end
-      end
     end
 
     describe 'remove assignee' do