diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-20 15:26:25 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-20 15:26:25 +0300 |
commit | a09983ae35713f5a2bbb100981116d31ce99826e (patch) | |
tree | 2ee2af7bd104d57086db360a7e6d8c9d5d43667a /lib/gitlab/emoji.rb | |
parent | 18c5ab32b738c0b6ecb4d0df3994000482f34bd8 (diff) |
Add latest changes from gitlab-org/gitlab@13-2-stable-ee
Diffstat (limited to 'lib/gitlab/emoji.rb')
-rw-r--r-- | lib/gitlab/emoji.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/gitlab/emoji.rb b/lib/gitlab/emoji.rb index bcf92b35720..cab21d875ab 100644 --- a/lib/gitlab/emoji.rb +++ b/lib/gitlab/emoji.rb @@ -44,6 +44,10 @@ module Gitlab "<img class='emoji' title=':#{name}:' alt=':#{name}:' src='#{src}' height='20' width='20' align='absmiddle' />" end + def emoji_exists?(name) + emojis.has_key?(name) + end + # CSS sprite fallback takes precedence over image fallback def gl_emoji_tag(name, options = {}) emoji_name = emojis_aliases[name] || name |