summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/ide/components/merge_requests
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-02-10 18:09:00 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-02-10 18:09:00 +0000
commitc57e10faab0abb213e7a18274fd5a98ba87a5c09 (patch)
treede0195e28dfe19fbfeb5bffa8fde4f511288d8ef /app/assets/javascripts/ide/components/merge_requests
parent11e5d1b9ca3efa7be34ddebb708a6aedb4e91639 (diff)
downloadgitlab-ce-c57e10faab0abb213e7a18274fd5a98ba87a5c09.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/ide/components/merge_requests')
-rw-r--r--app/assets/javascripts/ide/components/merge_requests/info.vue38
1 files changed, 0 insertions, 38 deletions
diff --git a/app/assets/javascripts/ide/components/merge_requests/info.vue b/app/assets/javascripts/ide/components/merge_requests/info.vue
deleted file mode 100644
index 73ec992466c..00000000000
--- a/app/assets/javascripts/ide/components/merge_requests/info.vue
+++ /dev/null
@@ -1,38 +0,0 @@
-<script>
-import { mapGetters } from 'vuex';
-import Icon from '../../../vue_shared/components/icon.vue';
-import TitleComponent from '../../../issue_show/components/title.vue';
-import DescriptionComponent from '../../../issue_show/components/description.vue';
-
-export default {
- components: {
- Icon,
- TitleComponent,
- DescriptionComponent,
- },
- computed: {
- ...mapGetters(['currentMergeRequest']),
- },
-};
-</script>
-
-<template>
- <div class="ide-merge-request-info h-100 d-flex flex-column">
- <div class="detail-page-header">
- <icon name="git-merge" class="align-self-center append-right-8" />
- <strong> !{{ currentMergeRequest.iid }} </strong>
- </div>
- <div class="issuable-details">
- <title-component
- :issuable-ref="currentMergeRequest.iid"
- :title-html="currentMergeRequest.title_html"
- :title-text="currentMergeRequest.title"
- />
- <description-component
- :description-html="currentMergeRequest.description_html"
- :description-text="currentMergeRequest.description"
- :can-update="false"
- />
- </div>
- </div>
-</template>