Commit 1f0ee9ca authored by Stan Hu's avatar Stan Hu

Fix sort ordering with merge request API

parent ef526ff3
...@@ -44,10 +44,9 @@ module API ...@@ -44,10 +44,9 @@ module API
args[:label_name] = args.delete(:labels) args[:label_name] = args.delete(:labels)
merge_requests = MergeRequestsFinder.new(current_user, args).execute merge_requests = MergeRequestsFinder.new(current_user, args).execute
merge_requests = paginate(merge_requests) merge_requests = merge_requests.reorder(args[:order_by] => args[:sort])
.preload(:notes, :target_project, :author, :assignee, :milestone, :merge_request_diff, :labels) paginate(merge_requests)
.preload(:notes, :target_project, :author, :assignee, :milestone, :merge_request_diff, :labels)
merge_requests.reorder(args[:order_by] => args[:sort])
end end
params :optional_params_ce do params :optional_params_ce do
......
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