diff options
| author | Rémy Coutable <remy@rymai.me> | 2018-05-30 11:52:21 +0300 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-05-30 11:52:21 +0300 |
| commit | 63d7408125ddbe366bfe468fa4a2f9637acf930b (patch) | |
| tree | b1f44e67a3cc272d93686135d71e95155f242939 /app/views/shared | |
| parent | fd79df64c5411308e67a62b4c02a07f5317ddec1 (diff) | |
| parent | 83d75c67e5e113faff46e6e46a609570cb324a9f (diff) | |
Merge branch 'render_super' into 'master'
CE: Add render_ce to render CE partial in EE partial
See merge request gitlab-org/gitlab-ce!19150
Diffstat (limited to 'app/views/shared')
| -rw-r--r-- | app/views/shared/issuable/form/_default_templates.html.haml | 4 | ||||
| -rw-r--r-- | app/views/shared/issuable/form/_title.html.haml | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/app/views/shared/issuable/form/_default_templates.html.haml b/app/views/shared/issuable/form/_default_templates.html.haml new file mode 100644 index 00000000000..49a5ce926b3 --- /dev/null +++ b/app/views/shared/issuable/form/_default_templates.html.haml @@ -0,0 +1,4 @@ +%p.form-text.text-muted + Add + = link_to 'description templates', help_page_path('user/project/description_templates'), tabindex: -1 + to help your contributors communicate effectively! diff --git a/app/views/shared/issuable/form/_title.html.haml b/app/views/shared/issuable/form/_title.html.haml index c4f30f5f4d9..c35d0b3751f 100644 --- a/app/views/shared/issuable/form/_title.html.haml +++ b/app/views/shared/issuable/form/_title.html.haml @@ -30,7 +30,4 @@ merge request from being merged before it's ready. - if no_issuable_templates && can?(current_user, :push_code, issuable.project) - %p.form-text.text-muted - Add - = link_to 'description templates', help_page_path('user/project/description_templates'), tabindex: -1 - to help your contributors communicate effectively! + = render 'shared/issuable/form/default_templates' |