diff options
| author | Luke Bennett <lukeeeebennettplus@gmail.com> | 2018-05-28 12:27:06 +0100 |
|---|---|---|
| committer | Luke Bennett <lukeeeebennettplus@gmail.com> | 2018-05-28 12:27:06 +0100 |
| commit | a9583bc9562512bd046a7f2c32fd267f32a5dac2 (patch) | |
| tree | af91d0688d49850746de400afdacb5389c0cfb16 /app/assets/javascripts/project_label_subscription.js | |
| parent | a3e472e0a7a6b6ec5654edd20b947ba660ed2dc3 (diff) | |
| parent | 265b1fafe64ae9fe8a3e92d83c1678b47533ba86 (diff) | |
| download | gitlab-ce-a9583bc9562512bd046a7f2c32fd267f32a5dac2.tar.gz | |
Merge remote-tracking branch 'origin/master' into 39549-label-list-page-redesign-with-draggable-labels
Diffstat (limited to 'app/assets/javascripts/project_label_subscription.js')
| -rw-r--r-- | app/assets/javascripts/project_label_subscription.js | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/app/assets/javascripts/project_label_subscription.js b/app/assets/javascripts/project_label_subscription.js index 72f03b02131..a5e68d1b0a0 100644 --- a/app/assets/javascripts/project_label_subscription.js +++ b/app/assets/javascripts/project_label_subscription.js @@ -39,7 +39,9 @@ export default class ProjectLabelSubscription { const $button = $(button); const originalTitle = $button.attr('data-original-title'); - if (originalTitle) ProjectLabelSubscription.setNewTitle($button, originalTitle, newStatus, newAction); + if (originalTitle) { + ProjectLabelSubscription.setNewTitle($button, originalTitle, newStatus, newAction); + } return button; }); @@ -51,6 +53,6 @@ export default class ProjectLabelSubscription { const actionRegexp = new RegExp(newStatusVerb, 'i'); const newTitle = originalTitle.replace(actionRegexp, newAction); - $button.tooltip('hide').attr('data-original-title', newTitle).tooltip('fixTitle'); + $button.tooltip('hide').attr('data-original-title', newTitle).tooltip('_fixTitle'); } } |