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

Merge branch 'avoid-api-helper-call' into 'master'
c111ba6a · Rémy Coutable · d6603493 · 9e608b41 · c111ba6a
Commit c111ba6a authored Nov 22, 2016 by Rémy Coutable
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

merge_requests.rb lib/api/merge_requests.rb +1 -1

No files found.
--- 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