diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-09-16 15:09:35 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-09-16 15:09:35 +0300 |
| commit | 4c16d4ff4f92987f609e9853da5900a51f0ad1be (patch) | |
| tree | 3ebc97c31f90db2f9c8fe4e5c5f33a502d68363d /app/assets/javascripts/vue_shared/components/notes | |
| parent | 3b85f5e4a123538b14eb052ae0efb9d7dbcd4e9b (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/vue_shared/components/notes')
| -rw-r--r-- | app/assets/javascripts/vue_shared/components/notes/system_note.vue | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/app/assets/javascripts/vue_shared/components/notes/system_note.vue b/app/assets/javascripts/vue_shared/components/notes/system_note.vue index d62a346355a..755e6f1f224 100644 --- a/app/assets/javascripts/vue_shared/components/notes/system_note.vue +++ b/app/assets/javascripts/vue_shared/components/notes/system_note.vue @@ -95,6 +95,9 @@ export default { methods: { ...mapActions(['fetchDescriptionVersion', 'softDeleteDescriptionVersion']), }, + safeHtmlConfig: { + ADD_TAGS: ['use'], // to support icon SVGs + }, }; </script> @@ -104,7 +107,7 @@ export default { :class="{ target: isTargetNote, 'pr-0': shouldShowDescriptionVersion }" class="note system-note note-wrapper" > - <div class="timeline-icon" v-html="iconHtml /* eslint-disable-line vue/no-v-html */"></div> + <div v-safe-html:[$options.safeHtmlConfig]="iconHtml" class="timeline-icon"></div> <div class="timeline-content"> <div class="note-header"> <note-header :author="note.author" :created-at="note.created_at" :note-id="note.id"> |