Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-03-24 18:08:44 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2020-03-24 18:08:44 +0300
commit120f4aaedc8fe830a3f572491d240d8ee6addefb (patch)
treea2138baa55dfa67d292fb1a83ce686ee7f5d10a5 /app/helpers/broadcast_messages_helper.rb
parent729e3765d5feb762df1ccfbc228a8dd4662aa3f9 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/helpers/broadcast_messages_helper.rb')
-rw-r--r--app/helpers/broadcast_messages_helper.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/helpers/broadcast_messages_helper.rb b/app/helpers/broadcast_messages_helper.rb
index 73c68dd9e18..0c32b48a85a 100644
--- a/app/helpers/broadcast_messages_helper.rb
+++ b/app/helpers/broadcast_messages_helper.rb
@@ -48,7 +48,7 @@ module BroadcastMessagesHelper
def render_broadcast_message(broadcast_message)
if Feature.enabled?(:broadcast_message_placeholders)
- Banzai.render_and_post_process(broadcast_message.message, {
+ Banzai.render_field_and_post_process(broadcast_message, :message, {
current_user: current_user,
skip_project_check: true,
broadcast_message_placeholders: true