Add latest changes from gitlab-org/gitlab@master

1 files changed, 8 insertions, 5 deletions

diff --git a/app/helpers/markup_helper.rb b/app/helpers/markup_helper.rb
index e2524938e10..e1e756c2f4c 100644
--- a/app/helpers/markup_helper.rb
+++ b/app/helpers/markup_helper.rb
@@ -51,12 +51,15 @@ module MarkupHelper
       text = fragment.children[0].text
       fragment.children[0].replace(link_to(text, url, html_options))
     else
-      # Traverse the fragment's first generation of children looking for pure
-      # text, wrapping anything found in the requested link
+      # Traverse the fragment's first generation of children looking for
+      # either pure text or emojis, wrapping anything found in the
+      # requested link
       fragment.children.each do |node|
-        next unless node.text?
-
-        node.replace(link_to(node.text, url, html_options))
+        if node.text?
+          node.replace(link_to(node.text, url, html_options))
+        elsif node.name == 'gl-emoji'
+          node.replace(link_to(node.to_html.html_safe, url, html_options))
+        end
       end
     end