Commit ea65d3be authored by Jacques Erasmus's avatar Jacques Erasmus

Merge branch...

Merge branch '228971-replace-vue_shared-tooltip-with-gitlab-ui-s-tooltip-in-app-assets-javascripts' into 'master'

Migrate revert and cherry-pick MR button tooltips to GitLab UI

See merge request gitlab-org/gitlab!44907
parents 4f62fed0 18df379a
<script> <script>
/* eslint-disable @gitlab/vue-require-i18n-strings */ /* eslint-disable @gitlab/vue-require-i18n-strings */
import { GlLoadingIcon, GlButton } from '@gitlab/ui'; import { GlLoadingIcon, GlButton, GlTooltipDirective } from '@gitlab/ui';
import { deprecatedCreateFlash as Flash } from '~/flash'; import { deprecatedCreateFlash as Flash } from '~/flash';
import tooltip from '~/vue_shared/directives/tooltip';
import { s__, __ } from '~/locale'; import { s__, __ } from '~/locale';
import ClipboardButton from '~/vue_shared/components/clipboard_button.vue'; import ClipboardButton from '~/vue_shared/components/clipboard_button.vue';
import MrWidgetAuthorTime from '../mr_widget_author_time.vue'; import MrWidgetAuthorTime from '../mr_widget_author_time.vue';
...@@ -12,7 +11,7 @@ import eventHub from '../../event_hub'; ...@@ -12,7 +11,7 @@ import eventHub from '../../event_hub';
export default { export default {
name: 'MRWidgetMerged', name: 'MRWidgetMerged',
directives: { directives: {
tooltip, GlTooltip: GlTooltipDirective,
}, },
components: { components: {
MrWidgetAuthorTime, MrWidgetAuthorTime,
...@@ -115,7 +114,7 @@ export default { ...@@ -115,7 +114,7 @@ export default {
/> />
<gl-button <gl-button
v-if="mr.canRevertInCurrentMR" v-if="mr.canRevertInCurrentMR"
v-tooltip v-gl-tooltip.hover
:title="revertTitle" :title="revertTitle"
size="small" size="small"
category="secondary" category="secondary"
...@@ -128,7 +127,7 @@ export default { ...@@ -128,7 +127,7 @@ export default {
</gl-button> </gl-button>
<gl-button <gl-button
v-else-if="mr.revertInForkPath" v-else-if="mr.revertInForkPath"
v-tooltip v-gl-tooltip.hover
:href="mr.revertInForkPath" :href="mr.revertInForkPath"
:title="revertTitle" :title="revertTitle"
size="small" size="small"
...@@ -140,7 +139,7 @@ export default { ...@@ -140,7 +139,7 @@ export default {
</gl-button> </gl-button>
<gl-button <gl-button
v-if="mr.canCherryPickInCurrentMR" v-if="mr.canCherryPickInCurrentMR"
v-tooltip v-gl-tooltip.hover
:title="cherryPickTitle" :title="cherryPickTitle"
size="small" size="small"
href="#modal-cherry-pick-commit" href="#modal-cherry-pick-commit"
...@@ -151,7 +150,7 @@ export default { ...@@ -151,7 +150,7 @@ export default {
</gl-button> </gl-button>
<gl-button <gl-button
v-else-if="mr.cherryPickInForkPath" v-else-if="mr.cherryPickInForkPath"
v-tooltip v-gl-tooltip.hover
:href="mr.cherryPickInForkPath" :href="mr.cherryPickInForkPath"
:title="cherryPickTitle" :title="cherryPickTitle"
size="small" size="small"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment