diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-20 12:55:51 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-20 12:55:51 +0300 |
| commit | e8d2c2579383897a1dd7f9debd359abe8ae8373d (patch) | |
| tree | c42be41678c2586d49a75cabce89322082698334 /app/assets/javascripts/emoji | |
| parent | fc845b37ec3a90aaa719975f607740c22ba6a113 (diff) | |
Add latest changes from gitlab-org/gitlab@14-1-stable-eev14.1.0-rc42
Diffstat (limited to 'app/assets/javascripts/emoji')
| -rw-r--r-- | app/assets/javascripts/emoji/components/emoji_group.vue | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/assets/javascripts/emoji/components/emoji_group.vue b/app/assets/javascripts/emoji/components/emoji_group.vue index 539cd6963b1..4f4c32af113 100644 --- a/app/assets/javascripts/emoji/components/emoji_group.vue +++ b/app/assets/javascripts/emoji/components/emoji_group.vue @@ -17,6 +17,7 @@ export default { }; </script> +<!-- eslint-disable-next-line vue/no-deprecated-functional-template --> <template functional> <div class="gl-display-flex gl-flex-wrap gl-mb-2"> <template v-if="props.renderGroup"> |