Commit 10d7ca38 authored by David O'Regan's avatar David O'Regan

Merge branch 'djadmin-vhtml-job-output' into 'master'

Switch to v-safe-html for rendering job output

See merge request gitlab-org/gitlab!72874
parents 7583738a 357ed717
<script> <script>
import { GlTooltipDirective, GlButton, GlIcon } from '@gitlab/ui'; import { GlTooltipDirective, GlButton, GlIcon, GlSafeHtmlDirective } from '@gitlab/ui';
import { throttle } from 'lodash'; import { throttle } from 'lodash';
import { mapActions, mapState } from 'vuex'; import { mapActions, mapState } from 'vuex';
import { __ } from '../../../locale'; import { __ } from '../../../locale';
...@@ -14,6 +14,7 @@ const scrollPositions = { ...@@ -14,6 +14,7 @@ const scrollPositions = {
export default { export default {
directives: { directives: {
GlTooltip: GlTooltipDirective, GlTooltip: GlTooltipDirective,
SafeHtml: GlSafeHtmlDirective,
}, },
components: { components: {
GlButton, GlButton,
...@@ -100,8 +101,8 @@ export default { ...@@ -100,8 +101,8 @@ export default {
<pre ref="buildJobLog" class="build-log mb-0 h-100 mr-3" @scroll="scrollBuildLog"> <pre ref="buildJobLog" class="build-log mb-0 h-100 mr-3" @scroll="scrollBuildLog">
<code <code
v-show="!detailJob.isLoading" v-show="!detailJob.isLoading"
v-safe-html="jobOutput"
class="bash" class="bash"
v-html="jobOutput /* eslint-disable-line vue/no-v-html */"
> >
</code> </code>
<div <div
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment