diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-09-20 14:18:08 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-09-20 14:18:08 +0300 |
commit | 5afcbe03ead9ada87621888a31a62652b10a7e4f (patch) | |
tree | 9918b67a0d0f0bafa6542e839a8be37adf73102d /lib/api/users.rb | |
parent | c97c0201564848c1f53226fe19d71fdcc472f7d0 (diff) |
Add latest changes from gitlab-org/gitlab@16-4-stable-eev16.4.0-rc42
Diffstat (limited to 'lib/api/users.rb')
-rw-r--r-- | lib/api/users.rb | 8 |
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 |