diff options
author | Marin Jankovski <marin@gitlab.com> | 2014-09-09 17:39:53 +0200 |
---|---|---|
committer | Marin Jankovski <marin@gitlab.com> | 2014-09-15 11:54:49 +0200 |
commit | b99b2e60d587143dcb5a18e3682fa49e3a735ab1 (patch) | |
tree | b496fe79b2d270b0f25f0fb3e965ee51f2cec254 /lib/api | |
parent | 09b23228dfa2242e4123e10091f8a0194ecdc3de (diff) | |
download | gitlab-ce-b99b2e60d587143dcb5a18e3682fa49e3a735ab1.tar.gz |
Ordering and sorting for MR in api.
Diffstat (limited to 'lib/api')
-rw-r--r-- | lib/api/merge_requests.rb | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/lib/api/merge_requests.rb b/lib/api/merge_requests.rb index 8726379bf3c..afe85623c0f 100644 --- a/lib/api/merge_requests.rb +++ b/lib/api/merge_requests.rb @@ -25,6 +25,10 @@ module API # GET /projects/:id/merge_requests # GET /projects/:id/merge_requests?state=opened # GET /projects/:id/merge_requests?state=closed + # GET /projects/:id/merge_requests?order_by=created_at + # GET /projects/:id/merge_requests?order_by=created_at + # GET /projects/:id/merge_requests?sort=desc + # GET /projects/:id/merge_requests?sort=asc # get ":id/merge_requests" do authorize! :read_merge_request, user_project @@ -36,6 +40,16 @@ module API else user_project.merge_requests end + sort = case params["sort"] + when 'desc' then 'DESC' + else 'ASC' + end + + mrs = case params["order_by"] + when 'updated_at' then mrs.order("updated_at #{sort}") + else mrs.order("created_at #{sort}") + end + present paginate(mrs), with: Entities::MergeRequest end |