2018-05-09 12:01:36 +05:30
|
|
|
<script>
|
|
|
|
|
import icon from '~/vue_shared/components/icon.vue';
|
|
|
|
|
import tooltip from '~/vue_shared/directives/tooltip';
|
|
|
|
|
|
|
|
|
|
export default {
|
|
|
|
|
components: {
|
|
|
|
|
icon,
|
|
|
|
|
},
|
|
|
|
|
directives: {
|
|
|
|
|
tooltip,
|
|
|
|
|
},
|
|
|
|
|
};
|
|
|
|
|
</script>
|
|
|
|
|
|
|
|
|
|
<template>
|
|
|
|
|
<icon
|
|
|
|
|
v-tooltip
|
2018-10-15 14:42:47 +05:30
|
|
|
:title="__('Part of merge request changes')"
|
2018-05-09 12:01:36 +05:30
|
|
|
:size="12"
|
2018-11-08 19:23:39 +05:30
|
|
|
name="git-merge"
|
2020-06-23 00:09:42 +05:30
|
|
|
class="gl-mr-3"
|
2018-05-09 12:01:36 +05:30
|
|
|
/>
|
|
|
|
|
</template>
|
