Add latest changes from gitlab-org/gitlab@14-9-stable-eev14.9.0-rc42

3 files changed, 41 insertions, 8 deletions

diff --git a/lib/gitlab/graphql/batch_key.rb b/lib/gitlab/graphql/batch_key.rb
index 51203af5a43..553e0573c63 100644
--- a/lib/gitlab/graphql/batch_key.rb
+++ b/lib/gitlab/graphql/batch_key.rb
@@ -4,6 +4,7 @@ module Gitlab
   module Graphql
     class BatchKey
       attr_reader :object
+
       delegate :hash, to: :object
 
       def initialize(object, lookahead = nil, object_name: nil)
diff --git a/lib/gitlab/graphql/loaders/batch_commit_loader.rb b/lib/gitlab/graphql/loaders/batch_commit_loader.rb
new file mode 100644
index 00000000000..26c1f61c567
--- /dev/null
+++ b/lib/gitlab/graphql/loaders/batch_commit_loader.rb
@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+module Gitlab
+  module Graphql
+    module Loaders
+      class BatchCommitLoader
+        def initialize(container_class:, container_id:, oid:)
+          @container_class = container_class
+          @container_id = container_id
+          @oid = oid
+        end
+
+        def find
+          Gitlab::Graphql::Lazy.with_value(find_containers) do |container|
+            BatchLoader::GraphQL.for(oid).batch(key: container) do |oids, loader, args|
+              container = args[:key]
+
+              container.repository.commits_by(oids: oids).each do |commit|
+                loader.call(commit.id, commit) if commit
+              end
+            end
+          end
+        end
+
+        private
+
+        def find_containers
+          BatchLoader::GraphQL.for(container_id.to_i).batch(key: container_class) do |ids, loader, args|
+            model = args[:key]
+            results = model.includes(:route).id_in(ids) # rubocop: disable CodeReuse/ActiveRecord
+
+            results.each { |record| loader.call(record.id, record) }
+          end
+        end
+
+        attr_reader :container_class, :container_id, :oid
+      end
+    end
+  end
+end
diff --git a/lib/gitlab/graphql/pagination/keyset/generic_keyset_pagination.rb b/lib/gitlab/graphql/pagination/keyset/generic_keyset_pagination.rb
index 15f95edd318..e8335a3c79c 100644
--- a/lib/gitlab/graphql/pagination/keyset/generic_keyset_pagination.rb
+++ b/lib/gitlab/graphql/pagination/keyset/generic_keyset_pagination.rb
@@ -17,21 +17,13 @@ module Gitlab
 
             strong_memoize(:generic_keyset_pagination_has_next_page) do
               if before
-                # If `before` is specified, that points to a specific record,
-                # even if it's the last one.  Since we're asking for `before`,
-                # then the specific record we're pointing to is in the
-                # next page
                 true
               elsif first
                 case sliced_nodes
                 when Array
                   sliced_nodes.size > limit_value
                 else
-                  # If we count the number of requested items plus one (`limit_value + 1`),
-                  # then if we get `limit_value + 1` then we know there is a next page
                   sliced_nodes.limit(1).offset(limit_value).exists?
-                  # replacing relation count
-                  # relation_count(set_limit(sliced_nodes, limit_value + 1)) == limit_value + 1
                 end
               else
                 false