Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-04-08 18:09:06 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2021-04-08 18:09:06 +0300
commit7a4a8bd5abf6ed6519f252abd79e5f528b8d29d6 (patch)
treeba92522281260a712f8de1daa3b40f10da494932 /app/assets/javascripts/emoji/components
parentcca8451493930537fcd14f50642599b94e13ce09 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/emoji/components')
-rw-r--r--app/assets/javascripts/emoji/components/picker.vue2
1 files changed, 2 insertions, 0 deletions
diff --git a/app/assets/javascripts/emoji/components/picker.vue b/app/assets/javascripts/emoji/components/picker.vue
index 37f3433b781..156bbb28ce6 100644
--- a/app/assets/javascripts/emoji/components/picker.vue
+++ b/app/assets/javascripts/emoji/components/picker.vue
@@ -82,6 +82,8 @@ export default {
no-flip
right
lazy
+ @shown="$emit('shown')"
+ @hidden="$emit('hidden')"
>
<template #button-content><slot name="button-content"></slot></template>
<gl-search-box-by-type