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/set_status_modal | |
parent | 951a32fcf3fc8766eae1430a389b77049410c371 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/set_status_modal')
-rw-r--r-- | app/assets/javascripts/set_status_modal/set_status_modal_wrapper.vue | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/app/assets/javascripts/set_status_modal/set_status_modal_wrapper.vue b/app/assets/javascripts/set_status_modal/set_status_modal_wrapper.vue index e522e3ff408..576cc0996bd 100644 --- a/app/assets/javascripts/set_status_modal/set_status_modal_wrapper.vue +++ b/app/assets/javascripts/set_status_modal/set_status_modal_wrapper.vue @@ -1,5 +1,4 @@ <script> -/* eslint-disable vue/no-v-html */ import { GlToast, GlModal, @@ -267,7 +266,7 @@ export default { @click="setEmoji" > <template #button-content> - <span v-html="emojiTag"></span> + <span v-html="emojiTag /* eslint-disable-line vue/no-v-html */"></span> <span v-show="noEmoji" class="js-no-emoji-placeholder no-emoji-placeholder position-relative" @@ -289,7 +288,7 @@ export default { class="js-toggle-emoji-menu emoji-menu-toggle-button btn" @click="showEmojiMenu" > - <span v-html="emojiTag"></span> + <span v-html="emojiTag /* eslint-disable-line vue/no-v-html */"></span> <span v-show="noEmoji" class="js-no-emoji-placeholder no-emoji-placeholder position-relative" |