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
iv
gitlab-ce
Commits
25974203
Commit
25974203
authored
Jan 04, 2016
by
Douwe Maan
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #9938 from huacnlee/hotfix/note_mail_with_notification
Hotfix note mail with notification
parents
01824a0f
99f3dc50
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
1 deletion
+4
-1
app/mailers/emails/notes.rb
app/mailers/emails/notes.rb
+1
-1
spec/services/notification_service_spec.rb
spec/services/notification_service_spec.rb
+3
-0
No files found.
app/mailers/emails/notes.rb
View file @
25974203
...
...
@@ -48,7 +48,7 @@ module Emails
yield
SentNotification
.
record
(
@note
,
recipient_id
,
reply_key
)
SentNotification
.
record
_note
(
@note
,
recipient_id
,
reply_key
)
end
end
end
spec/services/notification_service_spec.rb
View file @
25974203
...
...
@@ -52,6 +52,9 @@ describe NotificationService, services: true do
it
do
add_users_with_subscription
(
note
.
project
,
issue
)
# Ensure create SentNotification by noteable = issue 6 times, not noteable = note
expect
(
SentNotification
).
to
receive
(
:record
).
with
(
issue
,
any_args
).
exactly
(
6
).
times
ActionMailer
::
Base
.
deliveries
.
clear
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