Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNathan Friend <nathan@gitlab.com>2019-06-25 18:27:05 +0300
committerNathan Friend <nathan@gitlab.com>2019-06-25 18:37:08 +0300
commitbf213dce74c10208312d7ef429905a4517b2b4a3 (patch)
tree3c3617ce59ce574724d35b126fdcff1c03a224f3 /app/views/projects/edit.html.haml
parent2b327c1b4ddde98719eca2b0e8edab8d9079f2f2 (diff)
Update project MR setting section description (CE)
This commit updates the merge requests description text in the project settings page.
Diffstat (limited to 'app/views/projects/edit.html.haml')
-rw-r--r--app/views/projects/edit.html.haml2
1 files changed, 1 insertions, 1 deletions
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'