Use current_user for Notification#merge_mr

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

app/services/merge_requests/auto_merge_service.rb

@@ -12,7 +12,7 @@ module MergeRequests
         merge_request.author_id_of_changes = current_user.id
         merge_request.merge
 
-        notification.merge_mr(merge_request)
+        notification.merge_mr(merge_request, current_user)
         create_merge_event(merge_request)
         execute_project_hooks(merge_request)
 

app/services/merge_requests/merge_service.rb

@@ -10,7 +10,7 @@ module MergeRequests
       merge_request.author_id_of_changes = current_user.id
       merge_request.merge
 
-      notification.merge_mr(merge_request)
+      notification.merge_mr(merge_request, current_user)
       create_merge_event(merge_request)
       execute_project_hooks(merge_request)
 

app/services/notification_service.rb

@@ -86,12 +86,12 @@ class NotificationService
   #  * merge_request assignee if their notification level is not Disabled
   #  * project team members with notification level higher then Participating
   #
-  def merge_mr(merge_request)
+  def merge_mr(merge_request, current_user)
     recipients = reject_muted_users([merge_request.author, merge_request.assignee], merge_request.target_project)
     recipients = recipients.concat(project_watchers(merge_request.target_project)).uniq
 
     recipients.each do |recipient|
-      mailer.merged_merge_request_email(recipient.id, merge_request.id, merge_request.author_id_of_changes)
+      mailer.merged_merge_request_email(recipient.id, merge_request.id, current_user.id)
     end
   end