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
0
Merge Requests
0
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
Boxiang Sun
gitlab-ce
Commits
80647364
Commit
80647364
authored
Jul 19, 2017
by
http://jneen.net/
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
move the ability check to reject_users_without_access
parent
57aa5d63
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
1 deletion
+2
-1
app/services/notification_recipient_service.rb
app/services/notification_recipient_service.rb
+2
-1
No files found.
app/services/notification_recipient_service.rb
View file @
80647364
...
@@ -253,7 +253,6 @@ class NotificationRecipientService
...
@@ -253,7 +253,6 @@ class NotificationRecipientService
end
end
users
=
users
.
to_a
.
compact
.
uniq
users
=
users
.
to_a
.
compact
.
uniq
users
=
users
.
select
{
|
u
|
u
.
can?
(
:receive_notifications
)
}
users
.
reject
do
|
user
|
users
.
reject
do
|
user
|
global_notification_setting
=
user
.
global_notification_setting
global_notification_setting
=
user
.
global_notification_setting
...
@@ -287,6 +286,8 @@ class NotificationRecipientService
...
@@ -287,6 +286,8 @@ class NotificationRecipientService
end
end
def
reject_users_without_access
(
recipients
,
target
)
def
reject_users_without_access
(
recipients
,
target
)
recipients
=
recipients
.
select
{
|
u
|
u
.
can?
(
:receive_notifications
)
}
ability
=
case
target
ability
=
case
target
when
Issuable
when
Issuable
:"read_
#{
target
.
to_ability_name
}
"
:"read_
#{
target
.
to_ability_name
}
"
...
...
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