Fix sort ordering with merge request API

1f0ee9ca · Stan Hu · ef526ff3 · 1f0ee9ca
Commit 1f0ee9ca authored Jul 10, 2017 by Stan Hu
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 4 deletions

lib/api/merge_requests.rb lib/api/merge_requests.rb +3 -4

No files found.
--- a/lib/api/merge_requests.rb
+++ b/lib/api/merge_requests.rb
@@ -44,10 +44,9 @@ module API
          args[:label_name] = args.delete(:labels)
          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
        params :optional_params_ce do