Commit c111ba6a authored by Rémy Coutable's avatar Rémy Coutable

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
parents d6603493 9e608b41
...@@ -59,7 +59,7 @@ module API ...@@ -59,7 +59,7 @@ module API
else merge_requests else merge_requests
end 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 present paginate(merge_requests), with: Entities::MergeRequest, current_user: current_user, project: user_project
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment