diff options
author | Phil Hughes <me@iamphill.com> | 2018-01-31 09:27:30 +0000 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2018-01-31 09:27:30 +0000 |
commit | f165bda4ae2a92528e6f4da25825c1e441094c54 (patch) | |
tree | 3c68c58a56cdc390dc75e83a786200cf0e3fa662 /app/assets | |
parent | 58eb3c55c9d15bd604b926ffeae9401f0b70c53c (diff) | |
download | gitlab-ce-f165bda4ae2a92528e6f4da25825c1e441094c54.tar.gz |
fixed failing specs
Diffstat (limited to 'app/assets')
-rw-r--r-- | app/assets/javascripts/labels_select.js | 12 | ||||
-rw-r--r-- | app/assets/javascripts/merge_request_tabs.js | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/app/assets/javascripts/labels_select.js b/app/assets/javascripts/labels_select.js index 06b8333db27..5ecf81ad11d 100644 --- a/app/assets/javascripts/labels_select.js +++ b/app/assets/javascripts/labels_select.js @@ -102,28 +102,28 @@ export default class LabelsSelect { } $value.removeAttr('style').html(template); $sidebarCollapsedValue.text(labelCount); - + if (data.labels.length) { labelTitles = data.labels.map(function(label) { return label.title; }); - + if (labelTitles.length > 5) { labelTitles = labelTitles.slice(0, 5); labelTitles.push('and ' + (data.labels.length - 5) + ' more'); } - + labelTooltipTitle = labelTitles.join(', '); } else { labelTooltipTitle = ''; $sidebarLabelTooltip.tooltip('destroy'); } - + $sidebarLabelTooltip .attr('title', labelTooltipTitle) .tooltip('fixTitle'); - + $('.has-tooltip', $value).tooltip({ container: 'body' }); @@ -168,7 +168,7 @@ export default class LabelsSelect { data = extraData.concat(data); } } - + callback(data); if (showMenuAbove) { $dropdown.data('glDropdown').positionMenuAbove(); diff --git a/app/assets/javascripts/merge_request_tabs.js b/app/assets/javascripts/merge_request_tabs.js index f69506a0471..6151e90aa04 100644 --- a/app/assets/javascripts/merge_request_tabs.js +++ b/app/assets/javascripts/merge_request_tabs.js @@ -246,7 +246,7 @@ export default class MergeRequestTabs { return; } - this.toggleLoading(true) + this.toggleLoading(true); axios.get(`${source}.json`) .then(({ data }) => { |