Download as
Browse Code »

Commit 80daf9a7774fd757a8838f0b49b6384ec7ceb724

Authored by Dmitriy Zaporozhets
1 parent 8bbac457
Exists in spb-stable and in 3 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb

Use current_user for Notification#merge_mr 

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Showing 3 changed files with 4 additions and 4 deletions   Show diff stats
app/services/merge_requests/auto_merge_service.rb
  Diff comments   View file @80daf9a
@@ -12,7 +12,7 @@ module MergeRequests @@ -12,7 +12,7 @@ module MergeRequests
12 merge_request.author_id_of_changes = current_user.id 12 merge_request.author_id_of_changes = current_user.id
13 merge_request.merge 13 merge_request.merge
14 14
15 - notification.merge_mr(merge_request) 15 + notification.merge_mr(merge_request, current_user)
16 create_merge_event(merge_request) 16 create_merge_event(merge_request)
17 execute_project_hooks(merge_request) 17 execute_project_hooks(merge_request)
18 18
app/services/merge_requests/merge_service.rb
  Diff comments   View file @80daf9a
@@ -10,7 +10,7 @@ module MergeRequests @@ -10,7 +10,7 @@ module MergeRequests
10 merge_request.author_id_of_changes = current_user.id 10 merge_request.author_id_of_changes = current_user.id
11 merge_request.merge 11 merge_request.merge
12 12
13 - notification.merge_mr(merge_request) 13 + notification.merge_mr(merge_request, current_user)
14 create_merge_event(merge_request) 14 create_merge_event(merge_request)
15 execute_project_hooks(merge_request) 15 execute_project_hooks(merge_request)
16 16
app/services/notification_service.rb
  Diff comments   View file @80daf9a
@@ -86,12 +86,12 @@ class NotificationService @@ -86,12 +86,12 @@ class NotificationService
86 # * merge_request assignee if their notification level is not Disabled 86 # * merge_request assignee if their notification level is not Disabled
87 # * project team members with notification level higher then Participating 87 # * project team members with notification level higher then Participating
88 # 88 #
89 - def merge_mr(merge_request) 89 + def merge_mr(merge_request, current_user)
90 recipients = reject_muted_users([merge_request.author, merge_request.assignee], merge_request.target_project) 90 recipients = reject_muted_users([merge_request.author, merge_request.assignee], merge_request.target_project)
91 recipients = recipients.concat(project_watchers(merge_request.target_project)).uniq 91 recipients = recipients.concat(project_watchers(merge_request.target_project)).uniq
92 92
93 recipients.each do |recipient| 93 recipients.each do |recipient|
94 - mailer.merged_merge_request_email(recipient.id, merge_request.id, merge_request.author_id_of_changes) 94 + mailer.merged_merge_request_email(recipient.id, merge_request.id, current_user.id)
95 end 95 end
96 end 96 end
97 97