diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-21 09:09:17 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-21 09:09:17 +0300 |
commit | 5f80f7a4bf332c36b66f4d620bbc8b3e54d8f258 (patch) | |
tree | 412dd917f6496b989944876c3c49f5ff125eb00a /app/assets/javascripts/sidebar | |
parent | 005a5fa8a9a323933d83404ce1cc03f73f683c64 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/sidebar')
-rw-r--r-- | app/assets/javascripts/sidebar/components/subscriptions/subscriptions.vue | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/app/assets/javascripts/sidebar/components/subscriptions/subscriptions.vue b/app/assets/javascripts/sidebar/components/subscriptions/subscriptions.vue index 0457aad8795..6e004084077 100644 --- a/app/assets/javascripts/sidebar/components/subscriptions/subscriptions.vue +++ b/app/assets/javascripts/sidebar/components/subscriptions/subscriptions.vue @@ -1,9 +1,8 @@ <script> -import { GlIcon } from '@gitlab/ui'; +import { GlIcon, GlTooltipDirective } from '@gitlab/ui'; import { __ } from '~/locale'; import Tracking from '~/tracking'; import toggleButton from '~/vue_shared/components/toggle_button.vue'; -import tooltip from '~/vue_shared/directives/tooltip'; import eventHub from '../../event_hub'; const ICON_ON = 'notifications'; @@ -13,7 +12,7 @@ const LABEL_OFF = __('Notifications off'); export default { directives: { - tooltip, + GlTooltip: GlTooltipDirective, }, components: { GlIcon, @@ -110,12 +109,9 @@ export default { <div> <span ref="tooltip" - v-tooltip - class="sidebar-collapsed-icon" + v-gl-tooltip.viewport.left :title="notificationTooltip" - data-container="body" - data-placement="left" - data-boundary="viewport" + class="sidebar-collapsed-icon" @click="onClickCollapsedIcon" > <gl-icon |