summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/blob/components/blob_content.vue
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-03-04 15:08:09 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-03-04 15:08:09 +0000
commitd3fc3be040a4fed2328e23ef28696dd8bd8238b4 (patch)
treef1874ea5e6e3c50c6a3c2ca2900af4ae73a53119 /app/assets/javascripts/blob/components/blob_content.vue
parentc6c7437861bff9572747674095c4dfbdfbea4988 (diff)
downloadgitlab-ce-d3fc3be040a4fed2328e23ef28696dd8bd8238b4.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/blob/components/blob_content.vue')
-rw-r--r--app/assets/javascripts/blob/components/blob_content.vue8
1 files changed, 7 insertions, 1 deletions
diff --git a/app/assets/javascripts/blob/components/blob_content.vue b/app/assets/javascripts/blob/components/blob_content.vue
index 2639a099093..7d5d48cfc31 100644
--- a/app/assets/javascripts/blob/components/blob_content.vue
+++ b/app/assets/javascripts/blob/components/blob_content.vue
@@ -45,7 +45,13 @@ export default {
<template v-else>
<blob-content-error v-if="viewerError" :viewer-error="viewerError" />
- <component :is="viewer" v-else ref="contentViewer" :content="content" />
+ <component
+ :is="viewer"
+ v-else
+ ref="contentViewer"
+ :content="content"
+ :type="activeViewer.fileType"
+ />
</template>
</div>
</template>