Commit 78d13ab3 authored by Robert Speicher's avatar Robert Speicher

Merge branch 'id-improve-commits-endpoint-performance' into 'master'

Improve performance of API merge request commits endpoint

See merge request gitlab-org/gitlab!19500
parents 45d9380b 93eb59c7
...@@ -296,9 +296,12 @@ module API ...@@ -296,9 +296,12 @@ module API
end end
get ':id/merge_requests/:merge_request_iid/commits' do get ':id/merge_requests/:merge_request_iid/commits' do
merge_request = find_merge_request_with_access(params[:merge_request_iid]) merge_request = find_merge_request_with_access(params[:merge_request_iid])
commits = ::Kaminari.paginate_array(merge_request.commits)
present paginate(commits), with: Entities::Commit commits =
paginate(merge_request.merge_request_diff.merge_request_diff_commits)
.map { |commit| Commit.from_hash(commit.to_hash, merge_request.project) }
present commits, with: Entities::Commit
end end
desc 'Show the merge request changes' do desc 'Show the merge request changes' 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