Merge branch 'issuable-label-dropdown-position' into 'master'

Fixed the positioning of the label dropdown in the issuable form

The code that makes the label dropdown was removed on CE. A conflict with EE must of brought this code back.

See merge request !889

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

@@ -61,7 +61,7 @@
         = form.hidden_field :label_ids, multiple: true, value: ''
         .col-sm-10{ class: "#{"col-lg-8" if has_due_date} #{'issuable-form-padding-top' if !has_labels}" }
           .issuable-form-select-holder
-            = render "shared/issuable/label_dropdown", classes: ["js-issuable-form-dropdown"], selected: issuable.labels, data_options: { field_name: "#{issuable.class.model_name.param_key}[label_ids][]", show_any: false, show_menu_above: 'true' }, dropdown_title: "Select label"
+            = render "shared/issuable/label_dropdown", classes: ["js-issuable-form-dropdown"], selected: issuable.labels, data_options: { field_name: "#{issuable.class.model_name.param_key}[label_ids][]", show_any: false }, dropdown_title: "Select label"
 
       - if issuable.respond_to?(:weight)
         - weight_options = Issue.weight_options

spec/features/issues/form_spec.rb

@@ -44,6 +44,8 @@ describe 'New/edit issue', feature: true, js: true do
       page.within '.dropdown-menu-labels' do
         click_link label.title
         click_link label2.title
+
+        find('.dropdown-menu-close').click
       end
       page.within '.js-label-select' do
         expect(page).to have_content label.title