diff options
author | Robert Speicher <robert@gitlab.com> | 2017-03-14 19:03:54 +0000 |
---|---|---|
committer | Robert Speicher <robert@gitlab.com> | 2017-03-14 19:03:54 +0000 |
commit | 2e0510600ff37b4bf5426a5180fb08c6e88647b8 (patch) | |
tree | bbe5572e09b163eefd32ca5e226d126047f0b529 /app/helpers/events_helper.rb | |
parent | fe4a18653be9fa4246d89e367a40bd171776432f (diff) | |
parent | 3e29936a15eb2f6c9bc2d92ebf1a67a0cadb916e (diff) | |
download | gitlab-ce-2e0510600ff37b4bf5426a5180fb08c6e88647b8.tar.gz |
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
Diffstat (limited to 'app/helpers/events_helper.rb')
-rw-r--r-- | app/helpers/events_helper.rb | 4 |
1 files changed, 2 insertions, 2 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 |