diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-10-20 00:12:08 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-10-20 00:12:08 +0300 |
| commit | 840c85c174e4f134bdce103b8226d5a2a7bcd4ac (patch) | |
| tree | db0e17d07c19265e3696bafe9bf570114b946dbb /app/services/award_emojis | |
| parent | ee2c09733d98492dcd992c567e0b44ab2838f798 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/services/award_emojis')
| -rw-r--r-- | app/services/award_emojis/base_service.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/services/award_emojis/base_service.rb b/app/services/award_emojis/base_service.rb index a677d03a221..626e26d63b5 100644 --- a/app/services/award_emojis/base_service.rb +++ b/app/services/award_emojis/base_service.rb @@ -14,7 +14,7 @@ module AwardEmojis private def normalize_name(name) - Gitlab::Emoji.normalize_emoji_name(name) + TanukiEmoji.find_by_alpha_code(name)&.name || name end # Provide more error state data than what BaseService allows. |