diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-29 00:08:42 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-29 00:08:42 +0300 |
| commit | 669f67690a43e9ec7b6d148c6ec1391b379fa16e (patch) | |
| tree | c9fd1ad2e0748a959a24fe292bfe4c764797e421 /app/assets/javascripts/ide | |
| parent | 3e49ae159acbb703f005f5014772072cd90ef97b (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/ide')
| -rw-r--r-- | app/assets/javascripts/ide/components/commit_sidebar/list.vue | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/app/assets/javascripts/ide/components/commit_sidebar/list.vue b/app/assets/javascripts/ide/components/commit_sidebar/list.vue index 6f49a694cc1..729ff7c74ec 100644 --- a/app/assets/javascripts/ide/components/commit_sidebar/list.vue +++ b/app/assets/javascripts/ide/components/commit_sidebar/list.vue @@ -1,8 +1,7 @@ <script> import { mapActions } from 'vuex'; -import { GlModal, GlIcon } from '@gitlab/ui'; +import { GlModal, GlIcon, GlTooltipDirective } from '@gitlab/ui'; import { __, sprintf } from '~/locale'; -import tooltip from '~/vue_shared/directives/tooltip'; import ListItem from './list_item.vue'; export default { @@ -12,7 +11,7 @@ export default { GlModal, }, directives: { - tooltip, + GlTooltip: GlTooltipDirective, }, props: { fileList: { @@ -73,7 +72,7 @@ export default { <div class="d-flex ml-auto"> <button v-if="!stagedList" - v-tooltip + v-gl-tooltip :title="__('Discard all changes')" :aria-label="__('Discard all changes')" :disabled="!filesLength" |