Add latest changes from gitlab-org/gitlab@13-7-stable-eev13.7.0-rc42

1 files changed, 10 insertions, 4 deletions

diff --git a/app/assets/javascripts/issuable/auto_width_dropdown_select.js b/app/assets/javascripts/issuable/auto_width_dropdown_select.js
index e0fb58ef195..12f03873958 100644
--- a/app/assets/javascripts/issuable/auto_width_dropdown_select.js
+++ b/app/assets/javascripts/issuable/auto_width_dropdown_select.js
@@ -1,4 +1,5 @@
 import $ from 'jquery';
+import { loadCSSFile } from '../lib/utils/css_utils';
 
 let instanceCount = 0;
 
@@ -13,10 +14,15 @@ class AutoWidthDropdownSelect {
     const { dropdownClass } = this;
     import(/* webpackChunkName: 'select2' */ 'select2/select2')
       .then(() => {
-        this.$selectElement.select2({
-          dropdownCssClass: dropdownClass,
-          ...AutoWidthDropdownSelect.selectOptions(this.dropdownClass),
-        });
+        // eslint-disable-next-line promise/no-nesting
+        loadCSSFile(gon.select2_css_path)
+          .then(() => {
+            this.$selectElement.select2({
+              dropdownCssClass: dropdownClass,
+              ...AutoWidthDropdownSelect.selectOptions(this.dropdownClass),
+            });
+          })
+          .catch(() => {});
       })
       .catch(() => {});