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
Léo-Paul Géneau
gitlab-ce
Commits
cb877b7e
Commit
cb877b7e
authored
Jul 22, 2013
by
Javier Castro
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix notifications to handle participants and mentions on commits too
parent
707cea8d
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
9 deletions
+12
-9
app/services/notification_service.rb
app/services/notification_service.rb
+7
-7
spec/services/notification_service_spec.rb
spec/services/notification_service_spec.rb
+5
-2
No files found.
app/services/notification_service.rb
View file @
cb877b7e
...
...
@@ -106,15 +106,15 @@ class NotificationService
if
note
.
commit_id
.
present?
opts
.
merge!
(
commit_id:
note
.
commit_id
)
recipients
=
[
note
.
commit_author
]
else
opts
.
merge!
(
noteable_id:
note
.
noteable_id
)
target
=
note
.
noteable
if
target
.
respond_to?
(
:participants
)
recipients
=
target
.
participants
else
recipients
=
[]
end
end
target
=
note
.
noteable
if
target
.
respond_to?
(
:participants
)
recipients
=
target
.
participants
else
recipients
=
note
.
mentioned_users
end
# Get users who left comment in thread
...
...
spec/services/notification_service_spec.rb
View file @
cb877b7e
...
...
@@ -48,7 +48,7 @@ describe NotificationService do
end
context
'commit note'
do
let
(
:note
)
{
create
:note_on_commit
}
let
(
:note
)
{
create
(
:note_on_commit
,
note:
'@mention referenced'
)
}
before
do
build_team
(
note
.
project
)
...
...
@@ -57,6 +57,7 @@ describe NotificationService do
describe
:new_note
do
it
do
should_email
(
@u_watcher
.
id
)
should_email
(
@u_mentioned
.
id
)
should_not_email
(
note
.
author_id
)
should_not_email
(
@u_participating
.
id
)
should_not_email
(
@u_disabled
.
id
)
...
...
@@ -67,10 +68,12 @@ describe NotificationService do
create
(
:note_on_commit
,
author:
@u_participating
,
project_id:
note
.
project_id
,
commit_id:
note
.
commit_id
)
commit_id:
note
.
commit_id
,
note:
'@mention referenced'
)
should_email
(
@u_watcher
.
id
)
should_email
(
@u_participating
.
id
)
should_email
(
@u_mentioned
.
id
)
should_not_email
(
note
.
author_id
)
should_not_email
(
@u_disabled
.
id
)
notification
.
new_note
(
note
)
...
...
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