diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-25 18:07:47 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-25 18:07:47 +0300 |
commit | 6f2065c468b05658125b746169c56764a8ccddb1 (patch) | |
tree | 544a488ae2e65e2fcfe4acce4e56623b85bbce5e /app/views/shared | |
parent | e6baeabaa9651d90b03bb64ffce75a2c3cb89aab (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/shared')
-rw-r--r-- | app/views/shared/notifications/_custom_notifications.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/shared/notifications/_custom_notifications.html.haml b/app/views/shared/notifications/_custom_notifications.html.haml index 58d02602423..0142deb47f8 100644 --- a/app/views/shared/notifications/_custom_notifications.html.haml +++ b/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) } |