Add latest changes from gitlab-org/gitlab@16-4-stable-eev16.4.0-rc42

1 files changed, 6 insertions, 2 deletions

diff --git a/lib/api/users.rb b/lib/api/users.rb
index fff0e9fee06..a01ace3a9c3 100644
--- a/lib/api/users.rb
+++ b/lib/api/users.rb
@@ -141,7 +141,11 @@ module API
 
         users = users.preload(:user_detail)
 
-        present paginate(users), options
+        if Feature.enabled?(:api_keyset_pagination_multi_order)
+          present paginate_with_strategies(users), options
+        else
+          present paginate(users), options
+        end
       end
       # rubocop: enable CodeReuse/ActiveRecord
 
@@ -1021,7 +1025,7 @@ module API
 
       # Enabling /user endpoint for the v3 version to allow oauth
       # authentication through this endpoint.
-      version %w(v3 v4), using: :path do
+      version %w[v3 v4], using: :path do
         desc 'Get the currently authenticated user' do
           success Entities::UserPublic
         end