diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-09-20 16:18:24 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-09-20 16:18:24 +0300 |
| commit | 0653e08efd039a5905f3fa4f6e9cef9f5d2f799c (patch) | |
| tree | 4dcc884cf6d81db44adae4aa99f8ec1233a41f55 /app/assets/javascripts/notes/components/note_body.vue | |
| parent | 744144d28e3e7fddc117924fef88de5d9674fe4c (diff) | |
Add latest changes from gitlab-org/gitlab@14-3-stable-eev14.3.0-rc42
Diffstat (limited to 'app/assets/javascripts/notes/components/note_body.vue')
| -rw-r--r-- | app/assets/javascripts/notes/components/note_body.vue | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/app/assets/javascripts/notes/components/note_body.vue b/app/assets/javascripts/notes/components/note_body.vue index 9864e91c009..93f71276120 100644 --- a/app/assets/javascripts/notes/components/note_body.vue +++ b/app/assets/javascripts/notes/components/note_body.vue @@ -1,5 +1,4 @@ <script> -/* eslint-disable vue/no-v-html */ import $ from 'jquery'; import { escape } from 'lodash'; import { mapActions, mapGetters, mapState } from 'vuex'; @@ -163,7 +162,11 @@ export default { @addToBatch="addSuggestionToBatch" @removeFromBatch="removeSuggestionFromBatch" /> - <div v-else class="note-text md" v-html="note.note_html"></div> + <div + v-else + class="note-text md" + v-html="note.note_html /* eslint-disable-line vue/no-v-html */" + ></div> <note-form v-if="isEditing" ref="noteForm" |