Merge branch 'nicolasdular/remove-broadcast-type-feature-flag' into 'master'

Adds broadcast_type to broadcast messages

See merge request gitlab-org/gitlab!23974

app/views/admin/broadcast_messages/_form.html.haml

@@ -5,8 +5,7 @@
       = render_broadcast_message(@broadcast_message)
     - else
       Your message here
-- if Feature.enabled?(:broadcast_notification_type)
-  .d-flex.justify-content-center
+.d-flex.justify-content-center
   .broadcast-notification-message.preview.js-broadcast-notification-message-preview.mt-2{ class: ('hidden' unless @broadcast_message.notification? ) }
     = sprite_icon('bullhorn', size: 16, css_class:'vertical-align-text-top')
     .js-broadcast-message-preview
@@ -26,7 +25,6 @@
         required: true,
         dir: 'auto',
         data: { preview_path: preview_admin_broadcast_messages_path }
-  - if Feature.enabled?(:broadcast_notification_type)
   .form-group.row
     .col-sm-2.col-form-label
       = f.label :broadcast_type, _('Type')

app/views/layouts/_broadcast.html.haml

 - current_broadcast_banner_messages.each do |message|
   = broadcast_message(message)
-- if Feature.enabled?(:broadcast_notification_type)
-  = broadcast_message(current_broadcast_notification_message)
+= broadcast_message(current_broadcast_notification_message)

changelogs/unreleased/nicolasdular-add-broadcast-types.yml

+---
+title: Add broadcast types to broadcast messages
+merge_request:
+author:
+type: added