diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-04-02 15:08:25 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-04-02 15:08:25 +0300 |
commit | ac2d27b008ced210e234910179234bc45f31b7e1 (patch) | |
tree | a2c6b7b081eb6e32f9e33d11c85eb76a9053d18c /lib/gitlab/emoji.rb | |
parent | a84d2572e943a70fdf95ef4514499df7c5f9db67 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/emoji.rb')
-rw-r--r-- | lib/gitlab/emoji.rb | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/lib/gitlab/emoji.rb b/lib/gitlab/emoji.rb index 3c5d223b106..f539d627dcb 100644 --- a/lib/gitlab/emoji.rb +++ b/lib/gitlab/emoji.rb @@ -46,12 +46,13 @@ module Gitlab def custom_emoji_tag(name, image_source) data = { - name: name + name: name, + fallback_src: image_source, + unicode_version: 'custom' # Prevents frontend to check for Unicode support } + options = { title: name, data: data } - ActionController::Base.helpers.content_tag('gl-emoji', title: name, data: data) do - emoji_image_tag(name, image_source).html_safe - end + ActionController::Base.helpers.content_tag('gl-emoji', "", options) end end end |