diff options
| author | Alfredo Sumaran <alfredo@gitlab.com> | 2017-03-06 22:08:21 +0000 |
|---|---|---|
| committer | Alfredo Sumaran <alfredo@gitlab.com> | 2017-03-06 22:08:21 +0000 |
| commit | 0cc4afc96607b7f3b751ff7ca42c24a0b8499dbe (patch) | |
| tree | a801528fba45f6ade923c17fae0288df42beb454 | |
| parent | bba00a8aaf496868d3894c510eab3b343ac52f45 (diff) | |
| parent | d41f30d56e3641906783ecc2c1dd2dca41268c54 (diff) | |
| download | gitlab-ce-0cc4afc96607b7f3b751ff7ca42c24a0b8499dbe.tar.gz | |
Merge branch 'remove-subscribe-label-tooltip' into 'master'
Remove tooltips and titles from label subscription buttons
See merge request !9692
| -rw-r--r-- | app/views/shared/_label.html.haml | 4 | ||||
| -rw-r--r-- | changelogs/unreleased/remove-subscribe-label-tooltip.yml | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/app/views/shared/_label.html.haml b/app/views/shared/_label.html.haml index 1744a597c51..bd994cdad01 100644 --- a/app/views/shared/_label.html.haml +++ b/app/views/shared/_label.html.haml @@ -45,11 +45,11 @@ - if current_user && defined?(@project) .label-subscription.inline - if label.is_a?(ProjectLabel) - %button.js-subscribe-button.label-subscribe-button.btn.btn-default.btn-action{ type: 'button', title: label_subscription_toggle_button_text(label, @project), data: { toggle: 'tooltip', status: status, url: toggle_subscription_namespace_project_label_path(@project.namespace, @project, label) } } + %button.js-subscribe-button.label-subscribe-button.btn.btn-default{ type: 'button', data: { status: status, url: toggle_subscription_namespace_project_label_path(@project.namespace, @project, label) } } %span= label_subscription_toggle_button_text(label, @project) = icon('spinner spin', class: 'label-subscribe-button-loading') - else - %button.js-unsubscribe-button.label-subscribe-button.btn.btn-default.btn-action{ type: 'button', class: ('hidden' if status.unsubscribed?), title: 'Unsubscribe', data: { toggle: 'tooltip', url: group_label_unsubscribe_path(label, @project) } } + %button.js-unsubscribe-button.label-subscribe-button.btn.btn-default{ type: 'button', class: ('hidden' if status.unsubscribed?), data: { url: group_label_unsubscribe_path(label, @project) } } %span Unsubscribe = icon('spinner spin', class: 'label-subscribe-button-loading') diff --git a/changelogs/unreleased/remove-subscribe-label-tooltip.yml b/changelogs/unreleased/remove-subscribe-label-tooltip.yml new file mode 100644 index 00000000000..90b71d3be51 --- /dev/null +++ b/changelogs/unreleased/remove-subscribe-label-tooltip.yml @@ -0,0 +1,4 @@ +--- +title: Remove tooltips from label subscription buttons +merge_request: +author: |