Add latest changes from gitlab-org/gitlab@master

1 files changed, 2 insertions, 22 deletions

diff --git a/app/views/shared/issuable/form/_type_selector.html.haml b/app/views/shared/issuable/form/_type_selector.html.haml
index 6d4cd83d55b..2350864f0a6 100644
--- a/app/views/shared/issuable/form/_type_selector.html.haml
+++ b/app/views/shared/issuable/form/_type_selector.html.haml
@@ -5,28 +5,8 @@
     = _('Type')
     #js-type-popover
 
-  .issuable-form-select-holder.selectbox.form-group.gl-mb-0.gl-display-block
-    .dropdown.js-issuable-type-filter-dropdown-wrap
-      %button.dropdown-menu-toggle{ type: 'button', 'data-toggle' => 'dropdown' }
-        %span.dropdown-toggle-text.is-default
-          = issuable.issue_type.capitalize || _("Select type")
-        = sprite_icon('chevron-down', css_class: "dropdown-menu-toggle-icon")
-      .dropdown-menu.dropdown-menu-selectable.dropdown-select
-        .dropdown-title.gl-display-flex
-          %span.gl-ml-auto
-            = _("Select type")
-          %button.dropdown-title-button.dropdown-menu-close.gl-ml-auto{ type: 'button', "aria-label" => _('Close') }
-            = sprite_icon('close', size: 16, css_class: 'dropdown-menu-close-icon')
-        .dropdown-content{ data: { testid: 'issue-type-select-dropdown' } }
-          %ul
-            - if create_issue_type_allowed?(@project, :issue)
-              %li.js-filter-issuable-type
-                = link_to new_project_issue_path(@project), class: ("is-active" if issuable.issue?) do
-                  #{sprite_icon(work_item_type_icon(:issue), css_class: 'gl-icon')} #{_('Issue')}
-            - if create_issue_type_allowed?(@project, :incident)
-              %li.js-filter-issuable-type{ data: { track: { action: "select_issue_type_incident", label: "select_issue_type_incident_dropdown_option" } } }
-                = link_to new_project_issue_path(@project, { issuable_template: 'incident', issue: { issue_type: 'incident' } }), class: ("is-active" if issuable.incident?) do
-                  #{sprite_icon(work_item_type_icon(:incident), css_class: 'gl-icon')} #{_('Incident')}
+  .issuable-form-select-holder.form-group.gl-mb-0.gl-display-block
+    #js-type-select{ data: issuable_type_selector_data(issuable) }
 
   - if issuable.incident?
     %p.form-text.text-muted