Add latest changes from gitlab-org/gitlab@master

1 files changed, 6 insertions, 6 deletions

diff --git a/spec/features/projects/settings/user_manages_merge_requests_settings_spec.rb b/spec/features/projects/settings/user_manages_merge_requests_settings_spec.rb
index 77be351f3d8..6aa59f72d2a 100644
--- a/spec/features/projects/settings/user_manages_merge_requests_settings_spec.rb
+++ b/spec/features/projects/settings/user_manages_merge_requests_settings_spec.rb
@@ -50,7 +50,7 @@ RSpec.describe 'Projects > Settings > User manages merge request settings' do
     context 'when Pipelines are initially enabled' do
       it 'shows the Merge Requests settings' do
         expect(page).to have_content 'Pipelines must succeed'
-        expect(page).to have_content 'All discussions must be resolved'
+        expect(page).to have_content 'All threads must be resolved'
 
         within('.sharing-permissions-form') do
           find('.project-feature-controls[data-for="project[project_feature_attributes][merge_requests_access_level]"] .gl-toggle').click
@@ -58,7 +58,7 @@ RSpec.describe 'Projects > Settings > User manages merge request settings' do
         end
 
         expect(page).not_to have_content 'Pipelines must succeed'
-        expect(page).not_to have_content 'All discussions must be resolved'
+        expect(page).not_to have_content 'All threads must be resolved'
       end
     end
 
@@ -70,7 +70,7 @@ RSpec.describe 'Projects > Settings > User manages merge request settings' do
 
       it 'shows the Merge Requests settings that do not depend on Builds feature' do
         expect(page).to have_content 'Pipelines must succeed'
-        expect(page).to have_content 'All discussions must be resolved'
+        expect(page).to have_content 'All threads must be resolved'
 
         within('.sharing-permissions-form') do
           find('.project-feature-controls[data-for="project[project_feature_attributes][builds_access_level]"] .gl-toggle').click
@@ -78,7 +78,7 @@ RSpec.describe 'Projects > Settings > User manages merge request settings' do
         end
 
         expect(page).to have_content 'Pipelines must succeed'
-        expect(page).to have_content 'All discussions must be resolved'
+        expect(page).to have_content 'All threads must be resolved'
       end
     end
   end
@@ -91,7 +91,7 @@ RSpec.describe 'Projects > Settings > User manages merge request settings' do
 
     it 'does not show the Merge Requests settings' do
       expect(page).not_to have_content 'Pipelines must succeed'
-      expect(page).not_to have_content 'All discussions must be resolved'
+      expect(page).not_to have_content 'All threads must be resolved'
 
       within('.sharing-permissions-form') do
         find('.project-feature-controls[data-for="project[project_feature_attributes][merge_requests_access_level]"] .gl-toggle').click
@@ -99,7 +99,7 @@ RSpec.describe 'Projects > Settings > User manages merge request settings' do
       end
 
       expect(page).to have_content 'Pipelines must succeed'
-      expect(page).to have_content 'All discussions must be resolved'
+      expect(page).to have_content 'All threads must be resolved'
     end
   end