summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Schilling <rschilling@student.tugraz.at>2016-11-22 08:27:21 +0100
committerRobert Schilling <rschilling@student.tugraz.at>2016-11-22 11:26:29 +0100
commit9e608b41a13a148f74fc2ab153bf5b97047fe1bc (patch)
treea8c580afa410412f7e001b2c3c2c5e5cf1253af4
parent35d6ea4f5ee7605a7f4e4c44cc4b79a40aec9418 (diff)
downloadgitlab-ce-avoid-api-helper-call.tar.gz
Avoid helper call with default parametersavoid-api-helper-call
-rw-r--r--lib/api/merge_requests.rb2
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