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

CE backport for gitlab-org/gitlab-ee!11859: Update description text of "Merge requests" section of general project settings page

See merge request gitlab-org/gitlab-ce!27838

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

locale/gitlab.pot

@@ -1991,9 +1991,6 @@ msgstr ""
 msgid "Choose visibility level, enable/disable project features (issues, repository, wiki, snippets) and set permissions."
 msgstr ""
 
-msgid "Choose your merge method, options, checks, and set up a default merge request description template."
-msgstr ""
-
 msgid "CiStatusLabel|canceled"
 msgstr ""
 
@@ -8073,6 +8070,9 @@ msgstr ""
 msgid "ProjectSettings|Badges"
 msgstr ""
 
+msgid "ProjectSettings|Choose your merge method, merge options, and merge checks."
+msgstr ""
+
 msgid "ProjectSettings|Customize your project badges."
 msgstr ""