Merge branch 'add-pagination-commit-diffs' into 'master'

Add missing pagination on the commit diff endpoint Closes #43370 See merge request gitlab-org/gitlab-ce!17203

Merge branch 'add-pagination-commit-diffs' into 'master'
Add missing pagination on the commit diff endpoint Closes #43370 See merge request gitlab-org/gitlab-ce!17203
94ac29f6 · Robert Speicher · 3487441b · 0dafea86 · 94ac29f6 · 94ac29f6
--- a/changelogs/unreleased/17203-add-missing-pagination-commit-diff-endpoint.yml
+++ b/changelogs/unreleased/17203-add-missing-pagination-commit-diff-endpoint.yml
+---
+  title: Add missing pagination on the commit diff endpoint
+  merge_request: 17203
+  author: Maxime Roussin-Bélanger
+  type: fixed
--- a/lib/api/commits.rb
+++ b/lib/api/commits.rb
@@ -97,13 +97,16 @@ class Commits < Grape::API
      end
      params do
        requires :sha, type: String, desc: 'A commit sha, or the name of a branch or tag'
+        use :pagination
      end
      get ':id/repository/commits/:sha/diff', requirements: API::COMMIT_ENDPOINT_REQUIREMENTS do
        commit = user_project.commit(params[:sha])

        not_found! 'Commit' unless commit

-        present commit.raw_diffs.to_a, with: Entities::Diff
+        raw_diffs = ::Kaminari.paginate_array(commit.raw_diffs.to_a)
+
+        present paginate(raw_diffs), with: Entities::Diff
      end

      desc "Get a commit's comments" do

--- a/spec/requests/api/commits_spec.rb
+++ b/spec/requests/api/commits_spec.rb
@@ -698,6 +698,7 @@
        get api(route, current_user)

        expect(response).to have_gitlab_http_status(200)
+        expect(response).to include_pagination_headers
        expect(json_response.size).to be >= 1
        expect(json_response.first.keys).to include 'diff'
      end