diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-03-15 18:08:30 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-03-15 18:08:30 +0300 |
| commit | ce97c898865e06644ae9c04d5c3666775b9998cb (patch) | |
| tree | 03e9e241b7d713a9fd137be4be841e38297e7acd /app/assets/javascripts/emoji | |
| parent | b50c9d31e395afcab172d16760c5700c8cd5bcae (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/emoji')
| -rw-r--r-- | app/assets/javascripts/emoji/components/emoji_group.vue | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/app/assets/javascripts/emoji/components/emoji_group.vue b/app/assets/javascripts/emoji/components/emoji_group.vue index 4f4c32af113..bbac6866636 100644 --- a/app/assets/javascripts/emoji/components/emoji_group.vue +++ b/app/assets/javascripts/emoji/components/emoji_group.vue @@ -1,5 +1,10 @@ <script> +import { compatFunctionalMixin } from '~/lib/utils/vue3compat/compat_functional_mixin'; + export default { + // Temporary mixin for migration from Vue.js 2 to @vue/compat + mixins: [compatFunctionalMixin], + props: { emojis: { type: Array, |