Merge branch...

Merge branch '211445-follow-up-from-introduce-a-feature-flag-for-fixed-pipeline-notifications' into 'master'

Resolve "Follow-up from "Introduce a feature flag for fixed pipeline notifications""

Closes #211445

See merge request gitlab-org/gitlab!27880

app/helpers/notifications_helper.rb

@@ -120,4 +120,8 @@ module NotificationsHelper
   def can_read_project?(project)
     can?(current_user, :read_project, project)
   end
+
+  def notification_event_disabled?(event)
+    event == :fixed_pipeline && Feature.disabled?(:ci_pipeline_fixed_notifications)
+  end
 end

app/views/shared/notifications/_custom_notifications.html.haml

@@ -23,7 +23,7 @@
                   #{ paragraph.html_safe }
               .col-lg-8
                 - notification_setting.email_events.each_with_index do |event, index|
-                  - next if event == :fixed_pipeline && Feature.disabled?(:ci_pipeline_fixed_notifications)
+                  - next if notification_event_disabled?(event)
                   - field_id = "#{notifications_menu_identifier("modal", notification_setting)}_notification_setting[#{event}]"
                   .form-group
                     .form-check{ class: ("prepend-top-0" if index == 0) }

changelogs/unreleased/211445-follow-up-from-introduce-a-feature-flag-for-fixed-pipeline-notific.yml

+---
+title: Add an helper to check if a notification_event is enabled
+merge_request: 27880
+author: Jacopo Beschi @jacopo-beschi
+type: changed