diff options
| author | Nathan Friend <nathan@gitlab.com> | 2019-04-29 14:20:29 -0300 |
|---|---|---|
| committer | Nathan Friend <nathan@gitlab.com> | 2019-04-29 14:25:24 -0300 |
| commit | ac425032a760886f358ddcc9401c9c7d33a4614d (patch) | |
| tree | b17cc8776c7fd606f8127ed4be87e49b1b8e5bfd | |
| parent | ca8e5aded8e5e63b97a511ca7e50cc981ac7c4dd (diff) | |
| download | gitlab-ce-ce-11098-update-merge-request-settings-description-text.tar.gz | |
Update CE project MR setting section descriptionce-11098-update-merge-request-settings-description-text
This commit updates the merge requests description text in the project
settings page for CE.
4 files changed, 12 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..7bba0935020 --- /dev/null +++ b/app/views/projects/_merge_request_settings_description_text.html.haml @@ -0,0 +1,3 @@ +- bold_start = '<strong>'.html_safe +- bold_end = '</strong>'.html_safe +%p= s_('ProjectSettings|Choose your %{bold_start}Merge method%{bold_end}, %{bold_start}Merge options%{bold_end}, and %{bold_start}Merge checks%{bold_end}.').html_safe % { bold_start: bold_start, bold_end: bold_end }
\ No newline at end of file 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/27838-update-merge-request-settings-description-text.yml b/changelogs/unreleased/27838-update-merge-request-settings-description-text.yml new file mode 100644 index 00000000000..c6f2c9ad677 --- /dev/null +++ b/changelogs/unreleased/27838-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 diff --git a/locale/gitlab.pot b/locale/gitlab.pot index 78d50c74eac..314c6eed66c 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -1725,9 +1725,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 "" @@ -7132,6 +7129,9 @@ msgstr "" msgid "ProjectSettings|Badges" msgstr "" +msgid "ProjectSettings|Choose your %{bold_start}Merge method%{bold_end}, %{bold_start}Merge options%{bold_end}, and %{bold_start}Merge checks%{bold_end}." +msgstr "" + msgid "ProjectSettings|Customize your project badges." msgstr "" |