Add latest changes from gitlab-org/gitlab@13-5-stable-eev13.5.0-rc42

1 files changed, 7 insertions, 11 deletions

diff --git a/lib/api/commits.rb b/lib/api/commits.rb
index 20877fb5c5f..582ccd41847 100644
--- a/lib/api/commits.rb
+++ b/lib/api/commits.rb
@@ -3,7 +3,7 @@
 require 'mime/types'
 
 module API
-  class Commits < Grape::API::Instance
+  class Commits < ::API::Base
     include PaginationParams
 
     before do
@@ -62,19 +62,15 @@ module API
                                                   first_parent: first_parent,
                                                   order: order)
 
-        commit_count =
-          if all || path || before || after || first_parent
-            user_project.repository.count_commits(ref: ref, path: path, before: before, after: after, all: all, first_parent: first_parent)
-          else
-            # Cacheable commit count.
-            user_project.repository.commit_count_for_ref(ref)
-          end
+        serializer = with_stats ? Entities::CommitWithStats : Entities::Commit
 
+        # This tells kaminari that there is 1 more commit after the one we've
+        # loaded, meaning there will be a next page, if the currently loaded set
+        # of commits is equal to the requested page size.
+        commit_count = offset + commits.size + 1
         paginated_commits = Kaminari.paginate_array(commits, total_count: commit_count)
 
-        serializer = with_stats ? Entities::CommitWithStats : Entities::Commit
-
-        present paginate(paginated_commits), with: serializer
+        present paginate(paginated_commits, exclude_total_headers: true), with: serializer
       end
 
       desc 'Commit multiple file changes as one commit' do