Merge branch 'id-fix-notification-service-warnings' into 'master'

Fix 2.7 warnings by extracting kwargs

See merge request gitlab-org/gitlab!50895

app/services/issues/close_service.rb

@@ -31,7 +31,7 @@ module Issues
 
         closed_via = _("commit %{commit_id}") % { commit_id: closed_via.id } if closed_via.is_a?(Commit)
 
-        notification_service.async.close_issue(issue, current_user, closed_via: closed_via) if notifications
+        notification_service.async.close_issue(issue, current_user, { closed_via: closed_via }) if notifications
         todo_service.close_issue(issue, current_user)
         resolve_alert(issue)
         execute_hooks(issue, 'close')

app/services/notification_service.rb

@@ -118,8 +118,8 @@ class NotificationService
   #  * project team members with notification level higher then Participating
   #  * users with custom level checked with "close issue"
   #
-  def close_issue(issue, current_user, closed_via: nil)
-    close_resource_email(issue, current_user, :closed_issue_email, closed_via: closed_via)
+  def close_issue(issue, current_user, params = {})
+    close_resource_email(issue, current_user, :closed_issue_email, closed_via: params[:closed_via])
   end
 
   # When we reassign an issue we should send an email to:

ee/app/models/ee/merge_request.rb

@@ -79,7 +79,7 @@ module EE
         super.preload(:blocking_merge_requests)
       end
 
-      def sort_by_attribute(method, *args)
+      def sort_by_attribute(method, *args, **kwargs)
         if method.to_s == 'review_time_desc'
           order_review_time_desc
         else

lib/api/helpers/pagination.rb

@@ -3,8 +3,8 @@
 module API
   module Helpers
     module Pagination
-      def paginate(*args)
-        Gitlab::Pagination::OffsetPagination.new(self).paginate(*args)
+      def paginate(*args, **kwargs)
+        Gitlab::Pagination::OffsetPagination.new(self).paginate(*args, **kwargs)
       end
     end
   end