diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-26 00:08:06 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-26 00:08:06 +0300 |
| commit | e1549c75843d235607aebac9ed64f2fd10e549ed (patch) | |
| tree | d6b4213b87b57b323464c7e5c1b75091212f3373 /app/helpers | |
| parent | 5d75b2b9a9d11c20667895e6aa68ea4e76658c5d (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/helpers')
| -rw-r--r-- | app/helpers/broadcast_messages_helper.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/helpers/broadcast_messages_helper.rb b/app/helpers/broadcast_messages_helper.rb index 0c32b48a85a..881e11b10ea 100644 --- a/app/helpers/broadcast_messages_helper.rb +++ b/app/helpers/broadcast_messages_helper.rb @@ -47,7 +47,7 @@ module BroadcastMessagesHelper end def render_broadcast_message(broadcast_message) - if Feature.enabled?(:broadcast_message_placeholders) + if broadcast_message.notification? Banzai.render_field_and_post_process(broadcast_message, :message, { current_user: current_user, skip_project_check: true, |