Commit 7a91720b authored by Phil Hughes's avatar Phil Hughes

Merge branch 'tooltip-replace-mr-widget' into 'master'

Change tooltip to GlTooltip in mr_widget_missing_branch.vue

Closes #229018

See merge request gitlab-org/gitlab!43926
parents 12ac310f a29c07ef
<script> <script>
import { GlIcon } from '@gitlab/ui'; import { GlIcon, GlTooltipDirective } from '@gitlab/ui';
import { sprintf, s__ } from '~/locale'; import { sprintf, s__ } from '~/locale';
import tooltip from '~/vue_shared/directives/tooltip';
import statusIcon from '../mr_widget_status_icon.vue'; import statusIcon from '../mr_widget_status_icon.vue';
export default { export default {
name: 'MRWidgetMissingBranch', name: 'MRWidgetMissingBranch',
directives: { directives: {
tooltip, GlTooltip: GlTooltipDirective,
}, },
components: { components: {
GlIcon, GlIcon,
...@@ -52,7 +51,7 @@ export default { ...@@ -52,7 +51,7 @@ export default {
<span class="bold js-branch-text"> <span class="bold js-branch-text">
<span class="capitalize"> {{ missingBranchName }} </span> <span class="capitalize"> {{ missingBranchName }} </span>
{{ s__('mrWidget|branch does not exist.') }} {{ missingBranchNameMessage }} {{ s__('mrWidget|branch does not exist.') }} {{ missingBranchNameMessage }}
<gl-icon v-tooltip :title="message" :aria-label="message" name="question-o" /> <gl-icon v-gl-tooltip :title="message" :aria-label="message" name="question-o" />
</span> </span>
</div> </div>
</div> </div>
......
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