Merge branch '29425-fix-activity-stream-first-line-markdown' into 'master'

Fix first line markdown helper for user profile activity stream

Closes #29425

See merge request !9920

2 files changed, 3 insertions, 3 deletions

diff --git a/app/helpers/events_helper.rb b/app/helpers/events_helper.rb
index 5605393c0c3..fb872a13f74 100644
--- a/app/helpers/events_helper.rb
+++ b/app/helpers/events_helper.rb
@@ -165,8 +165,8 @@ module EventsHelper
 
     sanitize(
       text,
-      tags: %w(a img b pre code p span),
-      attributes: Rails::Html::WhiteListSanitizer.allowed_attributes + ['style']
+      tags: %w(a img gl-emoji b pre code p span),
+      attributes: Rails::Html::WhiteListSanitizer.allowed_attributes + ['style', 'data-name', 'data-unicode-version']
     )
   end
 
diff --git a/app/helpers/gitlab_markdown_helper.rb b/app/helpers/gitlab_markdown_helper.rb
index 6d365ea9251..6226cfe25cf 100644
--- a/app/helpers/gitlab_markdown_helper.rb
+++ b/app/helpers/gitlab_markdown_helper.rb
@@ -172,7 +172,7 @@ module GitlabMarkdownHelper
   # text hasn't already been truncated, then append "..." to the node contents
   # and return true.  Otherwise return false.
   def truncate_if_block(node, truncated)
-    if node.element? && node.description.block? && !truncated
+    if node.element? && node.description&.block? && !truncated
       node.inner_html = "#{node.inner_html}..." if node.next_sibling
       true
     else