diff options
author | Phil Hughes <me@iamphill.com> | 2018-01-17 09:21:37 +0000 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2018-01-17 09:21:37 +0000 |
commit | 83ab63de34f1b3af1202808eb309105ed586ada0 (patch) | |
tree | 13c322a286670b84f9731805f2375d5c8bf2c07c /app/assets/javascripts/notebook/cells | |
parent | 3f2df9c366d80b58209e2028a3bfe4e66c6b483c (diff) | |
download | gitlab-ce-83ab63de34f1b3af1202808eb309105ed586ada0.tar.gz |
fixed conflicts
Diffstat (limited to 'app/assets/javascripts/notebook/cells')
-rw-r--r-- | app/assets/javascripts/notebook/cells/output/html.vue | 38 |
1 files changed, 13 insertions, 25 deletions
diff --git a/app/assets/javascripts/notebook/cells/output/html.vue b/app/assets/javascripts/notebook/cells/output/html.vue index ed4695a4eb8..0535ee7afa8 100644 --- a/app/assets/javascripts/notebook/cells/output/html.vue +++ b/app/assets/javascripts/notebook/cells/output/html.vue @@ -1,42 +1,30 @@ <script> -<<<<<<< HEAD + import sanitize from 'sanitize-html'; import Prompt from '../prompt.vue'; -======= -import sanitize from 'sanitize-html'; -import Prompt from '../prompt.vue'; ->>>>>>> Merge branch 'fl-ipythin-10-3' into 'security-10-3' export default { components: { prompt: Prompt, }, -<<<<<<< HEAD props: { rawCode: { type: String, required: true, }, }, - }; -======= - }, - components: { - prompt: Prompt, - }, - computed: { - sanitizedOutput() { - return sanitize(this.rawCode, { - allowedTags: sanitize.defaults.allowedTags.concat([ - 'img', 'svg', - ]), - allowedAttributes: { - img: ['src'], - }, - }); + computed: { + sanitizedOutput() { + return sanitize(this.rawCode, { + allowedTags: sanitize.defaults.allowedTags.concat([ + 'img', 'svg', + ]), + allowedAttributes: { + img: ['src'], + }, + }); + }, }, - }, -}; ->>>>>>> Merge branch 'fl-ipythin-10-3' into 'security-10-3' + }; </script> <template> |