diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-11-22 12:58:43 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-11-22 12:58:43 +0000 |
| commit | c111ba6a76ff72f1563e912f82832e6f969d0ef6 (patch) | |
| tree | 86441036f9cbdd71b0ea43aa991b48c873c3e0b9 /lib | |
| parent | d6603493ea6ef347a5193c6df186c4576ca887b2 (diff) | |
| parent | 9e608b41a13a148f74fc2ab153bf5b97047fe1bc (diff) | |
| download | gitlab-ce-c111ba6a76ff72f1563e912f82832e6f969d0ef6.tar.gz | |
Merge branch 'avoid-api-helper-call' into 'master'
Avoid helper call with default parameters
The helpers can ultimately be removed when the issue API uses the Grape DSL.
See merge request !7649
Diffstat (limited to 'lib')
| -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 4176c7eec06..15488b33f31 100644 --- a/lib/api/merge_requests.rb +++ b/lib/api/merge_requests.rb @@ -59,7 +59,7 @@ module API else merge_requests end - merge_requests = merge_requests.reorder(issuable_order_by => issuable_sort) + merge_requests = merge_requests.reorder(params[:order_by] => params[:sort]) present paginate(merge_requests), with: Entities::MergeRequest, current_user: current_user, project: user_project end |