diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-12-18 03:10:04 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-12-18 03:10:04 +0300 |
| commit | 35aeb676e824679d7e1ec8772c668b91b1dbc1bc (patch) | |
| tree | 392f452d92c8a4bb15ea24322ae6532f45912243 /app/assets/javascripts/vue_shared | |
| parent | 43678813e8265b8a00b3039fce155f4c20947a7a (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/vue_shared')
| -rw-r--r-- | app/assets/javascripts/vue_shared/components/content_viewer/content_viewer.vue | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/javascripts/vue_shared/components/content_viewer/content_viewer.vue b/app/assets/javascripts/vue_shared/components/content_viewer/content_viewer.vue index 5ac30424f98..fa5707c306c 100644 --- a/app/assets/javascripts/vue_shared/components/content_viewer/content_viewer.vue +++ b/app/assets/javascripts/vue_shared/components/content_viewer/content_viewer.vue @@ -11,7 +11,7 @@ export default { }, props: { content: { - type: String, + type: [String, ArrayBuffer], default: '', required: false, }, |