diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-16 18:25:58 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-16 18:25:58 +0000 |
commit | a5f4bba440d7f9ea47046a0a561d49adf0a1e6d4 (patch) | |
tree | fb69158581673816a8cd895f9d352dcb3c678b1e /lib/gitlab/emoji.rb | |
parent | d16b2e8639e99961de6ddc93909f3bb5c1445ba1 (diff) | |
download | gitlab-ce-a5f4bba440d7f9ea47046a0a561d49adf0a1e6d4.tar.gz |
Add latest changes from gitlab-org/gitlab@14-0-stable-eev14.0.0-rc42
Diffstat (limited to 'lib/gitlab/emoji.rb')
-rw-r--r-- | lib/gitlab/emoji.rb | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/lib/gitlab/emoji.rb b/lib/gitlab/emoji.rb index e6f71e3ad3c..2b5f465d3c5 100644 --- a/lib/gitlab/emoji.rb +++ b/lib/gitlab/emoji.rb @@ -41,7 +41,17 @@ module Gitlab end def emoji_image_tag(name, src) - "<img class='emoji' title=':#{name}:' alt=':#{name}:' src='#{src}' height='20' width='20' align='absmiddle' />" + image_options = { + class: 'emoji', + src: src, + title: ":#{name}:", + alt: ":#{name}:", + height: 20, + width: 20, + align: 'absmiddle' + } + + ActionController::Base.helpers.tag(:img, image_options) end def emoji_exists?(name) |