Add latest changes from gitlab-org/gitlab@16-5-stable-eev16.5.0-rc42

1 files changed, 6 insertions, 2 deletions

diff --git a/app/assets/javascripts/emoji/awards_app/index.js b/app/assets/javascripts/emoji/awards_app/index.js
index f3d72c2dba5..965cb4f421a 100644
--- a/app/assets/javascripts/emoji/awards_app/index.js
+++ b/app/assets/javascripts/emoji/awards_app/index.js
@@ -9,14 +9,18 @@ export default (el) => {
   if (!el) return null;
 
   const {
-    dataset: { path },
+    dataset: { path, newCustomEmojiPath },
   } = el;
   const canAwardEmoji = parseBoolean(el.dataset.canAwardEmoji);
+  const showDefaultAwardEmojis = parseBoolean(el.dataset.showDefaultAwardEmojis);
 
   return new Vue({
     el,
     name: 'AwardsListRoot',
     store: createstore(),
+    provide: {
+      newCustomEmojiPath,
+    },
     computed: {
       ...mapState(['currentUserId', 'canAwardEmoji', 'awards']),
     },
@@ -35,7 +39,7 @@ export default (el) => {
           awards: this.awards,
           canAwardEmoji: this.canAwardEmoji,
           currentUserId: this.currentUserId,
-          defaultAwards: ['thumbsup', 'thumbsdown'],
+          defaultAwards: showDefaultAwardEmojis ? ['thumbsup', 'thumbsdown'] : [],
           selectedClass: 'selected',
         },
         on: {