Commit d4bfb315 authored by Jose Ivan Vargas's avatar Jose Ivan Vargas

Merge branch 'nmezzopera-restore-v-html-on-system-note' into 'master'

Use v-html for system note icon

See merge request gitlab-org/gitlab!41915
parents 2affb9b4 68c7244f
<script> <script>
/* eslint-disable vue/no-v-html */
/** /**
* Common component to render a system note, icon and user information. * Common component to render a system note, icon and user information.
* *
...@@ -106,7 +108,7 @@ export default { ...@@ -106,7 +108,7 @@ export default {
:class="{ target: isTargetNote, 'pr-0': shouldShowDescriptionVersion }" :class="{ target: isTargetNote, 'pr-0': shouldShowDescriptionVersion }"
class="note system-note note-wrapper" class="note system-note note-wrapper"
> >
<div v-safe-html="iconHtml" class="timeline-icon"></div> <div class="timeline-icon" v-html="iconHtml"></div>
<div class="timeline-content"> <div class="timeline-content">
<div class="note-header"> <div class="note-header">
<note-header :author="note.author" :created-at="note.created_at" :note-id="note.id"> <note-header :author="note.author" :created-at="note.created_at" :note-id="note.id">
......
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