diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-09-16 07:29:29 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-09-16 07:29:29 +0000 |
| commit | 7d59ba00b9aa1a8be28f1b7ccaa1c628be90aabb (patch) | |
| tree | 71c933ebbe4e37039ef819c533b720f11a5b1515 /lib/api | |
| parent | 63b04373235a009c5cd186ff087ab64b83550513 (diff) | |
| parent | 1c289ac0c3b7993cfca961a9b446267b700a97c7 (diff) | |
| download | gitlab-ce-7d59ba00b9aa1a8be28f1b7ccaa1c628be90aabb.tar.gz | |
Merge branch 'fix-api-mr-sort' into 'master'
Fix broken sort in merge request API
This MR fixes a bug in the API in querying for merge requests with a `sort_by` field would never change the ordering of the results.
Closes #2266
See merge request !1305
Diffstat (limited to 'lib/api')
| -rw-r--r-- | lib/api/merge_requests.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/api/merge_requests.rb b/lib/api/merge_requests.rb index 7412274b045..63ea2f05438 100644 --- a/lib/api/merge_requests.rb +++ b/lib/api/merge_requests.rb @@ -55,7 +55,7 @@ module API else merge_requests end - merge_requests.reorder(issuable_order_by => issuable_sort) + merge_requests = merge_requests.reorder(issuable_order_by => issuable_sort) present paginate(merge_requests), with: Entities::MergeRequest end |