diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-09-02 12:11:35 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-09-02 12:11:35 +0300 |
commit | ed0d55ded7a03c8d5da501d3c86b38084f695cae (patch) | |
tree | 8612868b90f496a1dacc29c1a7a78cd7d380a26b /app/assets/javascripts/vue_shared/alert_details | |
parent | 951a32fcf3fc8766eae1430a389b77049410c371 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/vue_shared/alert_details')
-rw-r--r-- | app/assets/javascripts/vue_shared/alert_details/components/system_notes/system_note.vue | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/app/assets/javascripts/vue_shared/alert_details/components/system_notes/system_note.vue b/app/assets/javascripts/vue_shared/alert_details/components/system_notes/system_note.vue index 3705e36a579..f8f1613879f 100644 --- a/app/assets/javascripts/vue_shared/alert_details/components/system_notes/system_note.vue +++ b/app/assets/javascripts/vue_shared/alert_details/components/system_notes/system_note.vue @@ -1,5 +1,4 @@ <script> -/* eslint-disable vue/no-v-html */ import { GlIcon } from '@gitlab/ui'; import NoteHeader from '~/notes/components/note_header.vue'; @@ -40,7 +39,7 @@ export default { <div class="note-header"> <note-header :author="noteAuthor" :created-at="note.createdAt" :note-id="note.id"> - <span v-html="note.bodyHtml"></span> + <span v-html="note.bodyHtml /* eslint-disable-line vue/no-v-html */"></span> </note-header> </div> </div> |