Commit 1dbee462 authored by Illya Klymov's avatar Illya Klymov

Merge branch...

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

Resolve "Replace vue_shared with GitLab UI tooltip in jobs/stage.vue"

See merge request gitlab-org/gitlab!44375
parents a30d40df 3740654a
<script> <script>
import { GlLoadingIcon, GlIcon } from '@gitlab/ui'; import { GlLoadingIcon, GlIcon, GlTooltipDirective } from '@gitlab/ui';
import tooltip from '../../../vue_shared/directives/tooltip';
import CiIcon from '../../../vue_shared/components/ci_icon.vue'; import CiIcon from '../../../vue_shared/components/ci_icon.vue';
import Item from './item.vue'; import Item from './item.vue';
export default { export default {
directives: { directives: {
tooltip, GlTooltip: GlTooltipDirective,
}, },
components: { components: {
GlIcon, GlIcon,
...@@ -67,7 +66,7 @@ export default { ...@@ -67,7 +66,7 @@ export default {
<ci-icon :status="stage.status" :size="24" /> <ci-icon :status="stage.status" :size="24" />
<strong <strong
ref="stageTitle" ref="stageTitle"
v-tooltip="showTooltip" v-gl-tooltip="showTooltip"
:title="showTooltip ? stage.name : null" :title="showTooltip ? stage.name : null"
data-container="body" data-container="body"
class="gl-ml-3 text-truncate" class="gl-ml-3 text-truncate"
......
...@@ -16,8 +16,6 @@ exports[`IDE pipeline stage renders stage details & icon 1`] = ` ...@@ -16,8 +16,6 @@ exports[`IDE pipeline stage renders stage details & icon 1`] = `
<strong <strong
class="gl-ml-3 text-truncate" class="gl-ml-3 text-truncate"
data-container="body" data-container="body"
data-original-title=""
title=""
> >
build build
......
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