Add latest changes from gitlab-org/gitlab@master

1 files changed, 19 insertions, 5 deletions

diff --git a/app/helpers/broadcast_messages_helper.rb b/app/helpers/broadcast_messages_helper.rb
index 21e57a8d391..b95fd8800c0 100644
--- a/app/helpers/broadcast_messages_helper.rb
+++ b/app/helpers/broadcast_messages_helper.rb
@@ -1,19 +1,29 @@
 # frozen_string_literal: true
 
 module BroadcastMessagesHelper
-  def current_broadcast_messages
-    BroadcastMessage.current(request.path)
+  def current_broadcast_banner_messages
+    BroadcastMessage.current_banner_messages(request.path)
   end
 
-  def broadcast_message(message)
+  def current_broadcast_notification_message
+    BroadcastMessage.current_notification_messages(request.path).last
+  end
+
+  def broadcast_message(message, opts = {})
     return unless message.present?
 
-    content_tag :div, dir: 'auto', class: 'broadcast-message', style: broadcast_message_style(message) do
-      sprite_icon('bullhorn', size: 16, css_class: 'vertical-align-text-top mr-2') << ' ' << render_broadcast_message(message)
+    classes = "broadcast-#{message.broadcast_type}-message #{opts[:preview] && 'preview'}"
+
+    content_tag :div, dir: 'auto', class: classes, style: broadcast_message_style(message) do
+      concat sprite_icon('bullhorn', size: 16, css_class: 'vertical-align-text-top')
+      concat ' '
+      concat render_broadcast_message(message)
     end
   end
 
   def broadcast_message_style(broadcast_message)
+    return '' if broadcast_message.notification?
+
     style = []
 
     if broadcast_message.color.present?
@@ -40,4 +50,8 @@ module BroadcastMessagesHelper
   def render_broadcast_message(broadcast_message)
     Banzai.render_field(broadcast_message, :message).html_safe
   end
+
+  def broadcast_type_options
+    BroadcastMessage.broadcast_types.keys.map { |w| [w.humanize, w] }
+  end
 end