Add latest changes from gitlab-org/gitlab@master

1 files changed, 3 insertions, 1 deletions

diff --git a/app/assets/javascripts/labels/create_label_dropdown.js b/app/assets/javascripts/labels/create_label_dropdown.js
index 8c166158a44..033ca9dd3ea 100644
--- a/app/assets/javascripts/labels/create_label_dropdown.js
+++ b/app/assets/javascripts/labels/create_label_dropdown.js
@@ -16,6 +16,7 @@ export default class CreateLabelDropdown {
     this.$colorPreview = $('.js-dropdown-label-color-preview', this.$el);
     this.$addList = $('.js-add-list', this.$el);
     this.$newLabelError = $('.js-label-error', this.$el);
+    this.$newLabelErrorContent = $('.gl-alert-content', this.$newLabelError);
     this.$newLabelCreateButton = $('.js-new-label-btn', this.$el);
     this.$colorSuggestions = $('.suggest-colors-dropdown a', this.$el);
 
@@ -119,7 +120,8 @@ export default class CreateLabelDropdown {
               .join('<br/>');
           }
 
-          this.$newLabelError.html(errors).show();
+          this.$newLabelErrorContent.html(errors);
+          this.$newLabelError.show();
         } else {
           const addNewList = this.$addList.is(':checked');
           this.$dropdownBack.trigger('click');