Add latest changes from gitlab-org/gitlab@master

1 files changed, 3 insertions, 2 deletions

diff --git a/app/assets/javascripts/labels_select.js b/app/assets/javascripts/labels_select.js
index 8e172b4827c..7b8193d5bf3 100644
--- a/app/assets/javascripts/labels_select.js
+++ b/app/assets/javascripts/labels_select.js
@@ -13,6 +13,7 @@ import ModalStore from './boards/stores/modal_store';
 import boardsStore from './boards/stores/boards_store';
 import { isScopedLabel } from '~/lib/utils/common_utils';
 import initDeprecatedJQueryDropdown from '~/deprecated_jquery_dropdown';
+import { fixTitle } from '~/tooltips';
 
 export default class LabelsSelect {
   constructor(els, options = {}) {
@@ -57,7 +58,6 @@ export default class LabelsSelect {
         .get();
       const scopedLabels = $dropdown.data('scopedLabels');
       const { handleClick } = options;
-      $sidebarLabelTooltip.tooltip();
 
       if ($dropdown.closest('.dropdown').find('.dropdown-new-label').length) {
         new CreateLabelDropdown(
@@ -166,7 +166,8 @@ export default class LabelsSelect {
               labelTooltipTitle = __('Labels');
             }
 
-            $sidebarLabelTooltip.attr('title', labelTooltipTitle).tooltip('_fixTitle');
+            $sidebarLabelTooltip.attr('title', labelTooltipTitle);
+            fixTitle($sidebarLabelTooltip);
 
             $('.has-tooltip', $value).tooltip({
               container: 'body',