Commit 57c6bf60 authored by Phil Hughes's avatar Phil Hughes

Merge branch 'move-approvals-body-vue-component' into 'master'

Rename merge request widget author component

See merge request gitlab-org/gitlab-ee!5693
parents 22384605 2982d068
......@@ -2,7 +2,7 @@
import tooltip from '../../vue_shared/directives/tooltip';
export default {
name: 'MRWidgetAuthor',
name: 'MrWidgetAuthor',
directives: {
tooltip,
},
......
<script>
import mrWidgetAuthor from './mr_widget_author.vue';
import MrWidgetAuthor from './mr_widget_author.vue';
export default {
name: 'MRWidgetAuthorTime',
components: {
mrWidgetAuthor,
MrWidgetAuthor,
},
props: {
actionText: {
......
<script>
import Flash from '../../../flash';
import statusIcon from '../mr_widget_status_icon.vue';
import mrWidgetAuthor from '../../components/mr_widget_author.vue';
import MrWidgetAuthor from '../../components/mr_widget_author.vue';
import eventHub from '../../event_hub';
export default {
name: 'MRWidgetMergeWhenPipelineSucceeds',
components: {
mrWidgetAuthor,
MrWidgetAuthor,
statusIcon,
},
props: {
......
......@@ -110,6 +110,7 @@ export default {
},
};
</script>
<template>
<div class="approvals-body space-children">
<span
......
---
title: Rename merge request widget author component
merge_request: 5693
author: George Tsiolis
type: performance
import Vue from 'vue';
import authorComponent from '~/vue_merge_request_widget/components/mr_widget_author.vue';
import MrWidgetAuthor from '~/vue_merge_request_widget/components/mr_widget_author.vue';
import mountComponent from 'spec/helpers/vue_mount_component_helper';
describe('MRWidgetAuthor', () => {
describe('MrRWidgetAuthor', () => {
let vm;
beforeEach(() => {
const Component = Vue.extend(authorComponent);
const Component = Vue.extend(MrWidgetAuthor);
vm = mountComponent(Component, {
author: {
......
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