Merge branch 'russell/project-settings-ui-text2' into 'master'

Improve UI text of project settings for merge requests

See merge request gitlab-org/gitlab!78756

ee/app/views/projects/_merge_request_settings_description_text.html.haml

 - if @project.feature_available?(:issuable_default_templates)
-  %p= s_('ProjectSettings|Choose your merge method, merge options, merge checks, merge suggestions, and set up a default description template for merge requests.')
+  %p= s_('ProjectSettings|Choose the method, options, checks, and squash options for merge requests. You can also set up merge request templates for different actions.')
 - else
-  %p= s_('ProjectSettings|Choose your merge method, merge options, merge checks, and merge suggestions.')
+  %p= s_('ProjectSettings|Choose your merge method, options, checks, and squash options.')

ee/spec/features/projects/settings/merge_requests_settings_spec.rb

@@ -124,7 +124,7 @@ RSpec.describe 'Project settings > [EE] Merge Requests', :js do
       it "does not mention the merge request template in the section's description text" do
         visit edit_project_path(project)
 
-        expect(page).to have_content('Choose your merge method, merge options, merge checks, and merge suggestions.')
+        expect(page).to have_content('Choose your merge method, options, checks, and squash options.')
       end
     end
 
@@ -142,7 +142,7 @@ RSpec.describe 'Project settings > [EE] Merge Requests', :js do
       it "mentions the merge request template in the section's description text" do
         visit edit_project_path(project)
 
-        expect(page).to have_content('Choose your merge method, merge options, merge checks, merge suggestions, and set up a default description template for merge requests.')
+        expect(page).to have_content('Choose the method, options, checks, and squash options for merge requests. You can also set up merge request templates for different actions.')
       end
     end
   end

locale/gitlab.pot

@@ -27983,10 +27983,13 @@ msgstr ""
 msgid "ProjectSettings|Checkbox is visible and unselected by default."
 msgstr ""
 
+msgid "ProjectSettings|Choose the method, options, checks, and squash options for merge requests. You can also set up merge request templates for different actions."
+msgstr ""
+
 msgid "ProjectSettings|Choose your merge method, merge options, merge checks, and merge suggestions."
 msgstr ""
 
-msgid "ProjectSettings|Choose your merge method, merge options, merge checks, merge suggestions, and set up a default description template for merge requests."
+msgid "ProjectSettings|Choose your merge method, options, checks, and squash options."
 msgstr ""
 
 msgid "ProjectSettings|Configure your project resources and monitor their health."