Merge branch '273541-issue-template-warning-appears-above-type-field' into 'master'

Moved template warning below type

See merge request gitlab-org/gitlab!47103

app/views/shared/form_elements/_apply_template_warning.html.haml

-.form-group.row.js-template-warning.mb-0.hidden.js-issuable-template-warning{ :class => ("gl-mb-5!" if issuable.supports_issue_type? && can?(current_user, :admin_issue, @project)) }
-  .offset-sm-2.col-sm-10
-
+.form-group.row.js-template-warning.hidden.js-issuable-template-warning
+  .col-sm-12
     .warning_message.mb-0{ role: 'alert' }
       %btn.js-close-btn.js-dismiss-btn.close{ type: "button", "aria-hidden": true, "aria-label": _("Close") }
         = sprite_icon("close")

app/views/shared/form_elements/_description.html.haml

@@ -14,6 +14,9 @@
 
     - if model.is_a?(Issuable)
       = render 'shared/issuable/form/template_selector', issuable: model
+
+    = render 'shared/form_elements/apply_template_warning', issuable: model
+
     = render layout: 'shared/md_preview', locals: { url: preview_url, referenced_users: true } do
       = render 'shared/zen', f: form, attr: :description,
                                classes: 'note-textarea qa-issuable-form-description rspec-issuable-form-description',

app/views/shared/issuable/_form.html.haml

@@ -20,8 +20,6 @@
   = render 'shared/issuable/form/title', issuable: issuable, form: form, has_wip_commits: commits && commits.detect(&:work_in_progress?)
 #js-suggestions{ data: { project_path: @project.full_path } }
 
-= render 'shared/form_elements/apply_template_warning', issuable: issuable
-
 = render 'shared/issuable/form/type_selector', issuable: issuable, form: form
 
 = render 'shared/form_elements/description', model: issuable, form: form, project: project

changelogs/unreleased/273541-issue-template-warning-appears-above-type-field.yml

+---
+title: Moved template warning below type
+merge_request: 47103
+author:
+type: fixed