Commit d75ca922 authored by Phil Hughes's avatar Phil Hughes

use pre-existing components for title and description

parent 5495454c
...@@ -3,6 +3,8 @@ import { mapGetters } from 'vuex'; ...@@ -3,6 +3,8 @@ import { mapGetters } from 'vuex';
import Icon from '../../../vue_shared/components/icon.vue'; import Icon from '../../../vue_shared/components/icon.vue';
import timeago from '../../../vue_shared/mixins/timeago'; import timeago from '../../../vue_shared/mixins/timeago';
import tooltip from '../../../vue_shared/directives/tooltip'; import tooltip from '../../../vue_shared/directives/tooltip';
import TitleComponent from '../../../issue_show/components/title.vue';
import DescriptionComponent from '../../../issue_show/components/description.vue';
const states = { const states = {
open: 'open', open: 'open',
...@@ -15,6 +17,8 @@ export default { ...@@ -15,6 +17,8 @@ export default {
}, },
components: { components: {
Icon, Icon,
TitleComponent,
DescriptionComponent,
}, },
mixins: [timeago], mixins: [timeago],
computed: { computed: {
...@@ -72,20 +76,16 @@ export default { ...@@ -72,20 +76,16 @@ export default {
</div> </div>
</div> </div>
</div> </div>
<div class="detail-page-description"> <div class="issuable-details">
<h2 class="title"> <title-component
{{ currentMergeRequest.title }} :issuable-ref="currentMergeRequest.iid"
</h2> :title-html="currentMergeRequest.title"
<div :title-text="currentMergeRequest.title"
v-if="currentMergeRequest.description" />
class="description" <description-component
> :description-html="currentMergeRequest.description"
<div class="wiki"> :description-text="currentMergeRequest.description"
<p dir="auto"> />
{{ currentMergeRequest.description }}
</p>
</div>
</div>
</div> </div>
</div> </div>
</template> </template>
......
<script> <script>
import animateMixin from '../mixins/animate'; import animateMixin from '../mixins/animate';
import eventHub from '../event_hub'; import eventHub from '../event_hub';
import tooltip from '../../vue_shared/directives/tooltip'; import tooltip from '../../vue_shared/directives/tooltip';
import { spriteIcon } from '../../lib/utils/common_utils'; import { spriteIcon } from '../../lib/utils/common_utils';
export default { export default {
directives: { directives: {
tooltip, tooltip,
}, },
mixins: [animateMixin], mixins: [animateMixin],
props: { props: {
issuableRef: { issuableRef: {
type: String, type: [String, Number],
required: true, required: true,
}, },
canUpdate: { canUpdate: {
...@@ -61,7 +61,7 @@ ...@@ -61,7 +61,7 @@
eventHub.$emit('open.form'); eventHub.$emit('open.form');
}, },
}, },
}; };
</script> </script>
<template> <template>
......
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