Remove broadcast_type feature flag

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

@@ -5,15 +5,14 @@
       = render_broadcast_message(@broadcast_message)
     - else
       Your message here
-- if Feature.enabled?(:broadcast_notification_type)
-  .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
-        - if @broadcast_message.message.present?
-          = render_broadcast_message(@broadcast_message)
-        - else
-          Your message here
+.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
+      - if @broadcast_message.message.present?
+        = render_broadcast_message(@broadcast_message)
+      - else
+        Your message here
 
 = form_for [:admin, @broadcast_message], html: { class: 'broadcast-message-form js-quick-submit js-requires-input'} do |f|
   = form_errors(@broadcast_message)
@@ -26,12 +25,11 @@
         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')
-      .col-sm-10
-        = f.select :broadcast_type, broadcast_type_options, {}, class: 'form-control js-broadcast-message-type'
+  .form-group.row
+    .col-sm-2.col-form-label
+      = f.label :broadcast_type, _('Type')
+    .col-sm-10
+      = f.select :broadcast_type, broadcast_type_options, {}, class: 'form-control js-broadcast-message-type'
   .form-group.row.js-broadcast-message-background-color-form-group{ class: ('hidden' unless @broadcast_message.banner? ) }
     .col-sm-2.col-form-label
       = f.label :color, _("Background color")

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