Add latest changes from gitlab-org/gitlab@14-5-stable-eev14.5.0-rc42

1 files changed, 5 insertions, 5 deletions

diff --git a/app/presenters/award_emoji_presenter.rb b/app/presenters/award_emoji_presenter.rb
index 8a7b58e0aba..9a1c8d6934d 100644
--- a/app/presenters/award_emoji_presenter.rb
+++ b/app/presenters/award_emoji_presenter.rb
@@ -4,24 +4,24 @@ class AwardEmojiPresenter < Gitlab::View::Presenter::Delegated
   presents ::AwardEmoji, as: :award_emoji
 
   def description
-    as_emoji['description']
+    as_emoji&.description
   end
 
   def unicode
-    as_emoji['unicode']
+    as_emoji&.hex
   end
 
   def emoji
-    as_emoji['moji']
+    as_emoji&.codepoints
   end
 
   def unicode_version
-    Gitlab::Emoji.emoji_unicode_version(award_emoji.name)
+    as_emoji&.unicode_version
   end
 
   private
 
   def as_emoji
-    @emoji ||= Gitlab::Emoji.emojis[award_emoji.name] || {}
+    @emoji ||= TanukiEmoji.find_by_alpha_code(award_emoji.name)
   end
 end