Add latest changes from gitlab-org/gitlab@master

2 files changed, 6 insertions, 2 deletions

diff --git a/app/assets/javascripts/vue_shared/components/awards_list.vue b/app/assets/javascripts/vue_shared/components/awards_list.vue
index 8f1f7ba0ad8..fd74ded7dc8 100644
--- a/app/assets/javascripts/vue_shared/components/awards_list.vue
+++ b/app/assets/javascripts/vue_shared/components/awards_list.vue
@@ -184,6 +184,7 @@ export default {
       class="gl-mr-3 gl-my-2"
       :class="awardList.classes"
       :title="awardList.title"
+      :data-emoji-name="awardList.name"
       data-testid="award-button"
       @click="handleAward(awardList.name)"
     >
diff --git a/app/assets/javascripts/vue_shared/components/entity_select/entity_select.vue b/app/assets/javascripts/vue_shared/components/entity_select/entity_select.vue
index 1a3220d8db9..970c24c6e87 100644
--- a/app/assets/javascripts/vue_shared/components/entity_select/entity_select.vue
+++ b/app/assets/javascripts/vue_shared/components/entity_select/entity_select.vue
@@ -75,10 +75,13 @@ export default {
   computed: {
     selected: {
       set(value) {
-        this.$emit('input', value);
         this.selectedValue = value;
         this.selectedText =
           value === null ? null : this.items.find((item) => item.value === value).text;
+        this.$emit('input', {
+          value: this.selectedValue,
+          text: this.selectedText,
+        });
       },
       get() {
         return this.selectedValue;
@@ -161,7 +164,7 @@ export default {
     },
     onReset() {
       this.selected = null;
-      this.$emit('input', null);
+      this.$emit('input', {});
     },
     onBottomReached() {
       this.fetchEntities(this.page + 1);