diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-12-13 23:05:46 +0300 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-12-13 23:05:46 +0300 |
| commit | 43b98944fb34d1a3ca37ae598327e4575d2ec315 (patch) | |
| tree | 325b180d9e182154183274b71baca9a495361202 /lib | |
| parent | 066f1b9392f848887280fe17c5fcdfc0272de61c (diff) | |
| parent | 55f322085d0507640366b7a774fe7819771ff54b (diff) | |
Merge branch '13695-order-contributors-in-api' into 'master'
Adds ordering to projects contributors in API
Closes #13695
See merge request gitlab-org/gitlab-ce!15469
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/api/repositories.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/api/repositories.rb b/lib/api/repositories.rb index 7887b886c03..4f36bbd760f 100644 --- a/lib/api/repositories.rb +++ b/lib/api/repositories.rb @@ -110,10 +110,12 @@ module API end params do use :pagination + optional :order_by, type: String, values: %w[email name commits], default: nil, desc: 'Return contributors ordered by `name` or `email` or `commits`' + optional :sort, type: String, values: %w[asc desc], default: nil, desc: 'Sort by asc (ascending) or desc (descending)' end get ':id/repository/contributors' do begin - contributors = ::Kaminari.paginate_array(user_project.repository.contributors) + contributors = ::Kaminari.paginate_array(user_project.repository.contributors(order_by: params[:order_by], sort: params[:sort])) present paginate(contributors), with: Entities::Contributor rescue not_found! |