diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2019-06-28 09:14:02 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2019-06-28 09:14:02 +0000 |
| commit | fad63d9eebb651c2bccfb17596461fef88437419 (patch) | |
| tree | 4edfb5196957f3f2c59a09f648d38bbd8a7d526e | |
| parent | e10726f6045c5b26f0b95e21fab1f64869109c08 (diff) | |
| parent | bf213dce74c10208312d7ef429905a4517b2b4a3 (diff) | |
| download | gitlab-ce-fad63d9eebb651c2bccfb17596461fef88437419.tar.gz | |
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
4 files changed, 10 insertions, 4 deletions
diff --git a/app/views/projects/_merge_request_settings_description_text.html.haml b/app/views/projects/_merge_request_settings_description_text.html.haml new file mode 100644 index 00000000000..42964c900b3 --- /dev/null +++ b/app/views/projects/_merge_request_settings_description_text.html.haml @@ -0,0 +1 @@ +%p= s_('ProjectSettings|Choose your merge method, merge options, and merge checks.') diff --git a/app/views/projects/edit.html.haml b/app/views/projects/edit.html.haml index c15b84d0aac..29b7c45201c 100644 --- a/app/views/projects/edit.html.haml +++ b/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' diff --git a/changelogs/unreleased/ce-11098-update-merge-request-settings-description-text.yml b/changelogs/unreleased/ce-11098-update-merge-request-settings-description-text.yml new file mode 100644 index 00000000000..9f6a2040095 --- /dev/null +++ b/changelogs/unreleased/ce-11098-update-merge-request-settings-description-text.yml @@ -0,0 +1,5 @@ +--- +title: Update merge requests section description text on project settings page +merge_request: 27838 +author: +type: changed
\ No newline at end of file diff --git a/locale/gitlab.pot b/locale/gitlab.pot index 81c21a35605..b8ce2c20563 100644 --- a/locale/gitlab.pot +++ b/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 "" |