kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Update project MR setting section description (CE) 

This commit updates the merge requests description text in the project
settings page.
This commit is contained in:
Nathan Friend 2019-06-25 12:27:05 -03:00
parent 2b327c1b4d
commit bf213dce74
No known key found for this signature in database
GPG Key ID: E010A0869C9F35D9
4 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/views/projects/_merge_request_settings_description_text.html.haml Normal file
View File

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

2
app/views/projects/edit.html.haml
View File

@ -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'

5
changelogs/unreleased/ce-11098-update-merge-request-settings-description-text.yml Normal file
View File

@ -0,0 +1,5 @@
---
title: Update merge requests section description text on project settings page
merge_request: 27838
author:
type: changed

6
locale/gitlab.pot
View 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 ""