Commit 825f8eb1 authored by Nicolò Maria Mezzopera's avatar Nicolò Maria Mezzopera

Merge branch...

Merge branch '241950-remove-v-html-from-app-assets-javascripts-diffs-components-inline_diff_table_row-vue' into 'master'

Remove v-html from app/assets/javascripts/diffs/components/inline_diff_table_row.vue

Closes #241950

See merge request gitlab-org/gitlab!41487
parents 0e109c7e dbbccb85
<script> <script>
/* eslint-disable vue/no-v-html */
import { mapActions, mapGetters, mapState } from 'vuex'; import { mapActions, mapGetters, mapState } from 'vuex';
import { GlTooltipDirective, GlIcon } from '@gitlab/ui'; import { GlTooltipDirective, GlIcon, GlSafeHtmlDirective as SafeHtml } from '@gitlab/ui';
import { import {
MATCH_LINE_TYPE, MATCH_LINE_TYPE,
NEW_LINE_TYPE, NEW_LINE_TYPE,
...@@ -26,6 +25,7 @@ export default { ...@@ -26,6 +25,7 @@ export default {
}, },
directives: { directives: {
GlTooltip: GlTooltipDirective, GlTooltip: GlTooltipDirective,
SafeHtml,
}, },
props: { props: {
fileHash: { fileHash: {
...@@ -242,6 +242,7 @@ export default { ...@@ -242,6 +242,7 @@ export default {
class="line-coverage" class="line-coverage"
></td> ></td>
<td <td
v-safe-html="line.rich_text"
:class="[ :class="[
line.type, line.type,
{ {
...@@ -249,7 +250,6 @@ export default { ...@@ -249,7 +250,6 @@ export default {
}, },
]" ]"
class="line_content with-coverage" class="line_content with-coverage"
v-html="line.rich_text"
></td> ></td>
</tr> </tr>
</template> </template>
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