diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-18 00:09:16 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-18 00:09:16 +0000 |
| commit | 2e31c85a97183814ffa7ba5cc58f7bbad668fb2b (patch) | |
| tree | 18be488a2381014d05dd0323228d00c153251a0f /app/helpers | |
| parent | 154b9bae142ba15fec753f44327654595094b879 (diff) | |
| download | gitlab-ce-2e31c85a97183814ffa7ba5cc58f7bbad668fb2b.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/helpers')
| -rw-r--r-- | app/helpers/broadcast_messages_helper.rb | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/app/helpers/broadcast_messages_helper.rb b/app/helpers/broadcast_messages_helper.rb index 7638710a7c2..73c68dd9e18 100644 --- a/app/helpers/broadcast_messages_helper.rb +++ b/app/helpers/broadcast_messages_helper.rb @@ -47,7 +47,15 @@ module BroadcastMessagesHelper end def render_broadcast_message(broadcast_message) - Banzai.render_field(broadcast_message, :message).html_safe + if Feature.enabled?(:broadcast_message_placeholders) + Banzai.render_and_post_process(broadcast_message.message, { + current_user: current_user, + skip_project_check: true, + broadcast_message_placeholders: true + }).html_safe + else + Banzai.render_field(broadcast_message, :message).html_safe + end end def broadcast_type_options |