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
da404697
Commit
da404697
authored
Jun 22, 2017
by
Valery Sizov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix spec/services/merge_requests/remove_approval_service_spec.rb [ci skip]
parent
dab13515
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
app/services/notification_service.rb
app/services/notification_service.rb
+2
-2
No files found.
app/services/notification_service.rb
View file @
da404697
...
...
@@ -403,7 +403,7 @@ class NotificationService
end
def
approve_mr_email
(
merge_request
,
project
,
current_user
)
recipients
=
NotificationRecipientService
.
new
(
project
).
build_recipients
(
merge_request
,
current_user
)
recipients
=
NotificationRecipientService
.
new
(
project
).
build_recipients
(
merge_request
,
current_user
,
action:
'approve'
)
recipients
.
each
do
|
recipient
|
mailer
.
approved_merge_request_email
(
recipient
.
id
,
merge_request
.
id
,
current_user
.
id
).
deliver_later
...
...
@@ -411,7 +411,7 @@ class NotificationService
end
def
unapprove_mr_email
(
merge_request
,
project
,
current_user
)
recipients
=
NotificationRecipientService
.
new
(
project
).
build_recipients
(
merge_request
,
current_user
)
recipients
=
NotificationRecipientService
.
new
(
project
).
build_recipients
(
merge_request
,
current_user
,
action:
'unapprove'
)
recipients
.
each
do
|
recipient
|
mailer
.
unapproved_merge_request_email
(
recipient
.
id
,
merge_request
.
id
,
current_user
.
id
).
deliver_later
...
...
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