Add latest changes from gitlab-org/gitlab@16-0-stable-eev16.0.0-rc42

2 files changed, 2 insertions, 4 deletions

diff --git a/lib/gitlab/pagination/keyset.rb b/lib/gitlab/pagination/keyset.rb
index 67a5530d46c..56017ba846c 100644
--- a/lib/gitlab/pagination/keyset.rb
+++ b/lib/gitlab/pagination/keyset.rb
@@ -3,12 +3,12 @@
 module Gitlab
   module Pagination
     module Keyset
-      SUPPORTED_TYPES = [
+      SUPPORTED_TYPES = %w[
         Project
       ].freeze
 
       def self.available_for_type?(relation)
-        SUPPORTED_TYPES.include?(relation.klass)
+        SUPPORTED_TYPES.include?(relation.klass.to_s)
       end
 
       def self.available?(request_context, relation)
diff --git a/lib/gitlab/pagination/keyset/paginator.rb b/lib/gitlab/pagination/keyset/paginator.rb
index 1ff4589d8e1..fb670a3f9ea 100644
--- a/lib/gitlab/pagination/keyset/paginator.rb
+++ b/lib/gitlab/pagination/keyset/paginator.rb
@@ -94,8 +94,6 @@ module Gitlab
             data = order.cursor_attributes_for_node(records.last)
             data[direction_key] = FORWARD_DIRECTION
             cursor_converter.dump(data)
-          else
-            nil
           end
         end