diff options
author | Robert Speicher <rspeicher@gmail.com> | 2016-02-03 23:01:04 -0500 |
---|---|---|
committer | Robert Speicher <rspeicher@gmail.com> | 2016-02-06 14:30:07 -0500 |
commit | 89b3ddd609063d93f39a02279f0f3e23b8b6b364 (patch) | |
tree | 4f36de052a6bbcfed2b884c860363037663601e7 /app/helpers/broadcast_messages_helper.rb | |
parent | 26f3cc41fc41f2901cc560aaecf1fe49cadda7ca (diff) | |
download | gitlab-ce-89b3ddd609063d93f39a02279f0f3e23b8b6b364.tar.gz |
Allow limited Markdown in Broadcast Messagesrs-broadcast-markdown
Closes #11853
Diffstat (limited to 'app/helpers/broadcast_messages_helper.rb')
-rw-r--r-- | app/helpers/broadcast_messages_helper.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/app/helpers/broadcast_messages_helper.rb b/app/helpers/broadcast_messages_helper.rb index 1ed8c710f77..43a29c96bca 100644 --- a/app/helpers/broadcast_messages_helper.rb +++ b/app/helpers/broadcast_messages_helper.rb @@ -3,7 +3,7 @@ module BroadcastMessagesHelper return unless message.present? content_tag :div, class: 'broadcast-message', style: broadcast_message_style(message) do - icon('bullhorn') << ' ' << message.message + icon('bullhorn') << ' ' << render_broadcast_message(message.message) end end @@ -31,4 +31,8 @@ module BroadcastMessagesHelper 'Pending' end end + + def render_broadcast_message(message) + Banzai.render(message, pipeline: :broadcast_message).html_safe + end end |