diff options
| author | Kamil Trzcinski <ayufan@ayufan.eu> | 2015-09-16 13:34:58 +0200 |
|---|---|---|
| committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2015-09-16 13:34:58 +0200 |
| commit | ac8d2eb065e9522679d4eae4649c6815daa5460c (patch) | |
| tree | 2947658dfff44a3873f7d350f0353dbdb7b9b541 /lib/api | |
| parent | 0859ba75a873ce78f77587369b9e761a2cc782db (diff) | |
| parent | 7d59ba00b9aa1a8be28f1b7ccaa1c628be90aabb (diff) | |
| download | gitlab-ce-ac8d2eb065e9522679d4eae4649c6815daa5460c.tar.gz | |
Merge remote-tracking branch 'origin/master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-gci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g
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 |