diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-11-18 13:16:36 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-11-18 13:16:36 +0000 |
commit | 311b0269b4eb9839fa63f80c8d7a58f32b8138a0 (patch) | |
tree | 07e7870bca8aed6d61fdcc810731c50d2c40af47 /app/helpers/emoji_helper.rb | |
parent | 27909cef6c4170ed9205afa7426b8d3de47cbb0c (diff) | |
download | gitlab-ce-311b0269b4eb9839fa63f80c8d7a58f32b8138a0.tar.gz |
Add latest changes from gitlab-org/gitlab@14-5-stable-eev14.5.0-rc42
Diffstat (limited to 'app/helpers/emoji_helper.rb')
-rw-r--r-- | app/helpers/emoji_helper.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/app/helpers/emoji_helper.rb b/app/helpers/emoji_helper.rb index 51b7fd7f352..c390924f7e3 100644 --- a/app/helpers/emoji_helper.rb +++ b/app/helpers/emoji_helper.rb @@ -1,7 +1,8 @@ # frozen_string_literal: true module EmojiHelper - def emoji_icon(*args) - raw Gitlab::Emoji.gl_emoji_tag(*args) + def emoji_icon(emoji_name, *options) + emoji = TanukiEmoji.find_by_alpha_code(emoji_name) + raw Gitlab::Emoji.gl_emoji_tag(emoji, *options) end end |