Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-05-14 15:08:21 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2020-05-14 15:08:21 +0300
commit674e7e2c3d295704bdf504dd0caa2e5a2d9b5cd2 (patch)
tree7454890d4f7aa8644c9e89954a978466e4416815 /app/assets/javascripts/notebook/cells/output/index.vue
parentc7ad2610df033b370845995ac3bbe269a191d9bb (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/notebook/cells/output/index.vue')
-rw-r--r--app/assets/javascripts/notebook/cells/output/index.vue3
1 files changed, 3 insertions, 0 deletions
diff --git a/app/assets/javascripts/notebook/cells/output/index.vue b/app/assets/javascripts/notebook/cells/output/index.vue
index 61626f7aaf5..f2d3796cccf 100644
--- a/app/assets/javascripts/notebook/cells/output/index.vue
+++ b/app/assets/javascripts/notebook/cells/output/index.vue
@@ -63,6 +63,9 @@ export default {
},
rawCode(output) {
if (output.text) {
+ if (typeof output.text === 'string') {
+ return output.text;
+ }
return output.text.join('');
}