Commit bf213dce authored by Nathan Friend's avatar Nathan Friend

Update project MR setting section description (CE)

This commit updates the merge requests description text in the project
settings page.
parent 2b327c1b
%p= s_('ProjectSettings|Choose your merge method, merge options, and merge checks.')
......@@ -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'
......
---
title: Update merge requests section description text on project settings page
merge_request: 27838
author:
type: changed
\ No newline at end of file
......@@ -1923,9 +1923,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 ""
......@@ -7927,6 +7924,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 ""
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment