Commit 155bf7e5 authored by Mayra Cabrera's avatar Mayra Cabrera

Merge branch 'feature-default-enabled-notification_setting_recipient_refactor' into 'master'

Enable notification_setting_recipient_refactor by default [RUN ALL RSPEC] [RUN AS-IF-FOSS]

See merge request gitlab-org/gitlab!61443
parents e7e9c5bf 6e5d74d3
...@@ -100,7 +100,7 @@ module NotificationRecipients ...@@ -100,7 +100,7 @@ module NotificationRecipients
# Get project/group users with CUSTOM notification level # Get project/group users with CUSTOM notification level
# rubocop: disable CodeReuse/ActiveRecord # rubocop: disable CodeReuse/ActiveRecord
def add_custom_notifications def add_custom_notifications
return new_add_custom_notifications if Feature.enabled?(:notification_setting_recipient_refactor, project) return new_add_custom_notifications if Feature.enabled?(:notification_setting_recipient_refactor, project, default_enabled: :yaml)
user_ids = [] user_ids = []
...@@ -172,7 +172,7 @@ module NotificationRecipients ...@@ -172,7 +172,7 @@ module NotificationRecipients
# Get project users with WATCH notification level # Get project users with WATCH notification level
# rubocop: disable CodeReuse/ActiveRecord # rubocop: disable CodeReuse/ActiveRecord
def project_watchers def project_watchers
return new_project_watchers if Feature.enabled?(:notification_setting_recipient_refactor, project) return new_project_watchers if Feature.enabled?(:notification_setting_recipient_refactor, project, default_enabled: :yaml)
project_members_ids = user_ids_notifiable_on(project) project_members_ids = user_ids_notifiable_on(project)
...@@ -200,7 +200,7 @@ module NotificationRecipients ...@@ -200,7 +200,7 @@ module NotificationRecipients
# rubocop: disable CodeReuse/ActiveRecord # rubocop: disable CodeReuse/ActiveRecord
def group_watchers def group_watchers
return new_group_watchers if Feature.enabled?(:notification_setting_recipient_refactor, project) return new_group_watchers if Feature.enabled?(:notification_setting_recipient_refactor, project, default_enabled: :yaml)
user_ids_with_group_global = user_ids_notifiable_on(group, :global) user_ids_with_group_global = user_ids_notifiable_on(group, :global)
user_ids = user_ids_with_global_level_watch(user_ids_with_group_global) user_ids = user_ids_with_global_level_watch(user_ids_with_group_global)
......
---
title: Enable notification settings recipient refactor by default
merge_request: 61443
author:
type: performance
...@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/327303 ...@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/327303
milestone: '13.11' milestone: '13.11'
type: development type: development
group: group::code review group: group::code review
default_enabled: false default_enabled: true
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment