diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-20 12:55:51 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-20 12:55:51 +0300 |
| commit | e8d2c2579383897a1dd7f9debd359abe8ae8373d (patch) | |
| tree | c42be41678c2586d49a75cabce89322082698334 /app/assets/javascripts/blob/components/blob_content.vue | |
| parent | fc845b37ec3a90aaa719975f607740c22ba6a113 (diff) | |
Add latest changes from gitlab-org/gitlab@14-1-stable-eev14.1.0-rc42
Diffstat (limited to 'app/assets/javascripts/blob/components/blob_content.vue')
| -rw-r--r-- | app/assets/javascripts/blob/components/blob_content.vue | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/app/assets/javascripts/blob/components/blob_content.vue b/app/assets/javascripts/blob/components/blob_content.vue index 60729c11002..1a74675100b 100644 --- a/app/assets/javascripts/blob/components/blob_content.vue +++ b/app/assets/javascripts/blob/components/blob_content.vue @@ -27,6 +27,11 @@ export default { default: false, required: false, }, + richViewer: { + type: String, + default: '', + required: false, + }, loading: { type: Boolean, default: true, @@ -71,6 +76,7 @@ export default { v-else ref="contentViewer" :content="content" + :rich-viewer="richViewer" :is-raw-content="isRawContent" :file-name="blob.name" :type="activeViewer.fileType" |