Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
6e5d74d3
Commit
6e5d74d3
authored
May 12, 2021
by
David Kim
Committed by
Mayra Cabrera
May 12, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Enable notification_setting_recipient_refactor by default [RUN ALL RSPEC] [RUN AS-IF-FOSS]
parent
74ab847a
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
4 deletions
+9
-4
app/services/notification_recipients/builder/base.rb
app/services/notification_recipients/builder/base.rb
+3
-3
changelogs/unreleased/feature-default-enabled-notification_setting_recipient_refactor.yml
...fault-enabled-notification_setting_recipient_refactor.yml
+5
-0
config/feature_flags/development/notification_setting_recipient_refactor.yml
...s/development/notification_setting_recipient_refactor.yml
+1
-1
No files found.
app/services/notification_recipients/builder/base.rb
View file @
6e5d74d3
...
...
@@ -100,7 +100,7 @@ module NotificationRecipients
# Get project/group users with CUSTOM notification level
# rubocop: disable CodeReuse/ActiveRecord
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
=
[]
...
...
@@ -172,7 +172,7 @@ module NotificationRecipients
# Get project users with WATCH notification level
# rubocop: disable CodeReuse/ActiveRecord
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
)
...
...
@@ -200,7 +200,7 @@ module NotificationRecipients
# rubocop: disable CodeReuse/ActiveRecord
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
=
user_ids_with_global_level_watch
(
user_ids_with_group_global
)
...
...
changelogs/unreleased/feature-default-enabled-notification_setting_recipient_refactor.yml
0 → 100644
View file @
6e5d74d3
---
title
:
Enable notification settings recipient refactor by default
merge_request
:
61443
author
:
type
:
performance
config/feature_flags/development/notification_setting_recipient_refactor.yml
View file @
6e5d74d3
...
...
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/327303
milestone
:
'
13.11'
type
:
development
group
:
group::code review
default_enabled
:
fals
e
default_enabled
:
tru
e
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment