Add latest changes from gitlab-org/gitlab@14-0-stable-eev14.0.0-rc42

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)