fix conflict resolution in api/v3/merge_request_diffs

e0bd3118 · Jarka Kadlecova · 9cb9dc40 · e0bd3118
Commit e0bd3118 authored Sep 11, 2017 by Jarka Kadlecova
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

lib/api/v3/merge_request_diffs.rb lib/api/v3/merge_request_diffs.rb +1 -1

No files found.
--- a/lib/api/v3/merge_request_diffs.rb
+++ b/lib/api/v3/merge_request_diffs.rb
@@ -22,7 +22,7 @@ module API
        get ":id/merge_requests/:merge_request_id/versions" do
          merge_request = find_merge_request_with_access(params[:merge_request_id])

-          present merge_request.merge_request_diffs.order_id_desc, with: ::API::Entities::MergeRequestDiff
+          present paginate(merge_request.merge_request_diffs.order_id_desc), with: ::API::Entities::MergeRequestDiff
        end

        desc 'Get a single merge request diff version' do