Merge branch '11098-update-merge-request-settings-description-text' into 'master'

Update description text of "Merge requests" section of general project settings page

Closes #11098

See merge request gitlab-org/gitlab-ee!11859

app/views/projects/_merge_request_settings_description_text.html.haml

+%p= s_('ProjectSettings|Choose your merge method, merge options, and merge checks.')

app/views/projects/edit.html.haml

@@ -27,7 +27,7 @@
   .settings-header
     %h4.settings-title.js-settings-toggle.js-settings-toggle-trigger-only= _('Merge requests')
     %button.btn.btn-default.js-settings-toggle{ type: 'button' }= expanded ? _('Collapse') : _('Expand')
-    %p= _('Choose your merge method, options, checks, and set up a default merge request description template.')
+    = render_if_exists 'projects/merge_request_settings_description_text'
 
   .settings-content
     = render_if_exists 'shared/promotions/promote_mr_features'

changelogs/unreleased/ce-11098-update-merge-request-settings-description-text.yml

+---
+title: Update merge requests section description text on project settings page
+merge_request: 27838
+author:
+type: changed
\ No newline at end of file

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

@@ -9,7 +9,7 @@
 - if @project.feature_available?(:issuable_default_templates)
   .form-group
     = form.label :merge_requests_template, class: 'label-bold' do
-      Default description template for merge requests
+      = _('Default description template for merge requests')
       = link_to icon('question-circle'), help_page_path('user/project/description_templates', anchor: 'setting-a-default-template-for-issues-and-merge-requests'), target: '_blank'
     = form.text_area :merge_requests_template, class: "form-control", rows: 3
     .text-secondary

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, and set up a default description template for merge requests.')
+- else
+  %p= s_('ProjectSettings|Choose your merge method, merge options, and merge checks.')

ee/changelogs/unreleased/11098-update-merge-request-settings-description-text.yml

+---
+title: Update merge requests section description text on project settings page
+merge_request: 11098
+author:
+type: changed

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

@@ -98,6 +98,12 @@ describe 'Project settings > [EE] Merge Requests', :js do
 
       expect(page).not_to have_selector('#project_merge_requests_template')
     end
+
+    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, and merge checks.')
+    end
   end
 
   context 'issuable default templates feature is available' do
@@ -105,11 +111,17 @@ describe 'Project settings > [EE] Merge Requests', :js do
       stub_licensed_features(issuable_default_templates: true)
     end
 
-    it 'input to configure merge request template is not shown' do
+    it 'input to configure merge request template is shown' do
       visit edit_project_path(project)
 
       expect(page).to have_selector('#project_merge_requests_template')
     end
+
+    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, and set up a default description template for merge requests.')
+    end
   end
 
   shared_examples 'the merge train feature is not available' do

locale/gitlab.pot

@@ -2572,9 +2572,6 @@ msgstr ""
 msgid "Choose which shards you wish to synchronize to this secondary node."
 msgstr ""
 
-msgid "Choose your merge method, options, checks, and set up a default merge request description template."
-msgstr ""
-
 msgid "CiStatusLabel|canceled"
 msgstr ""
 
@@ -4101,6 +4098,9 @@ msgstr ""
 msgid "Default description template for issues"
 msgstr ""
 
+msgid "Default description template for merge requests"
+msgstr ""
+
 msgid "Default first day of the week"
 msgstr ""
 
@@ -10528,6 +10528,12 @@ msgstr ""
 msgid "ProjectSettings|Badges"
 msgstr ""
 
+msgid "ProjectSettings|Choose your merge method, merge options, and merge checks."
+msgstr ""
+
+msgid "ProjectSettings|Choose your merge method, merge options, merge checks, and set up a default description template for merge requests."
+msgstr ""
+
 msgid "ProjectSettings|Contact an admin to change this setting."
 msgstr ""