diff options
| author | Clement Ho <ClemMakesApps@gmail.com> | 2018-04-19 13:43:06 -0500 |
|---|---|---|
| committer | Clement Ho <ClemMakesApps@gmail.com> | 2018-04-19 13:43:06 -0500 |
| commit | cefeeaea3364c52afc8077c6eaa8914a4bb27852 (patch) | |
| tree | 03c1100e2636510f89982b4a3473e868a3745eab /app/assets/javascripts/labels_select.js | |
| parent | 59d6161e1ea5f4650fe45a0f6bd2e45bb061f6e1 (diff) | |
| parent | b1e9d98a29605daf7ccdd0e324dd399fdebfee41 (diff) | |
| download | gitlab-ce-cefeeaea3364c52afc8077c6eaa8914a4bb27852.tar.gz | |
Merge branch 'master' into bootstrap4
Diffstat (limited to 'app/assets/javascripts/labels_select.js')
| -rw-r--r-- | app/assets/javascripts/labels_select.js | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/app/assets/javascripts/labels_select.js b/app/assets/javascripts/labels_select.js index 6d49167dfc4..eafdaf4a672 100644 --- a/app/assets/javascripts/labels_select.js +++ b/app/assets/javascripts/labels_select.js @@ -83,7 +83,7 @@ export default class LabelsSelect { $dropdown.trigger('loading.gl.dropdown'); axios.put(issueUpdateURL, data) .then(({ data }) => { - var labelCount, template, labelTooltipTitle, labelTitles; + var labelCount, template, labelTooltipTitle, labelTitles, formattedLabels; $loading.fadeOut(); $dropdown.trigger('loaded.gl.dropdown'); $selectbox.hide(); @@ -115,8 +115,7 @@ export default class LabelsSelect { labelTooltipTitle = labelTitles.join(', '); } else { - labelTooltipTitle = ''; - $sidebarLabelTooltip.tooltip('destroy'); + labelTooltipTitle = __('Labels'); } $sidebarLabelTooltip |