diff options
| author | Nathan Friend <nathan@gitlab.com> | 2019-04-12 11:41:31 -0300 |
|---|---|---|
| committer | Nathan Friend <nathan@gitlab.com> | 2019-04-17 12:53:37 -0300 |
| commit | bb51dd97e1828a52da2abbd06ab795b544795e95 (patch) | |
| tree | 7e51b519538a444f38a22391f558fa5a9380e0e9 /app/views/projects/edit.html.haml | |
| parent | 6ef494369dc415c869ff31d717398d2a461552f6 (diff) | |
| download | gitlab-ce-bb51dd97e1828a52da2abbd06ab795b544795e95.tar.gz | |
Update CE-specific files for project MR settings UIce-10725-restructure-project-merge-request-settings-page
This commit updates the CE-specific files that reorganizes the project
merge request settings UI.
Diffstat (limited to 'app/views/projects/edit.html.haml')
| -rw-r--r-- | app/views/projects/edit.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/projects/edit.html.haml b/app/views/projects/edit.html.haml index 1a3e4a5d608..c04530dc62c 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, set up a default merge request description template.') + %p= _('Choose your merge method, options, checks, and set up a default merge request description template.') .settings-content = render_if_exists 'shared/promotions/promote_mr_features' |