Add latest changes from gitlab-org/gitlab@master

3 files changed, 5 insertions, 4 deletions

diff --git a/lib/gitlab/database/background_migration/batched_migration.rb b/lib/gitlab/database/background_migration/batched_migration.rb
index 429dc79e170..3c09ec3bd91 100644
--- a/lib/gitlab/database/background_migration/batched_migration.rb
+++ b/lib/gitlab/database/background_migration/batched_migration.rb
@@ -25,6 +25,7 @@ module Gitlab
 
         scope :queue_order, -> { order(id: :asc) }
         scope :queued, -> { with_statuses(:active, :paused) }
+        scope :finalizing, -> { with_status(:finalizing) }
         scope :ordered_by_created_at_desc, -> { order(created_at: :desc) }
 
         # on_hold_until is a temporary runtime status which puts execution "on hold"
diff --git a/lib/gitlab/graphql/authorize/authorize_resource.rb b/lib/gitlab/graphql/authorize/authorize_resource.rb
index 983bdb9c0a2..e3548b97ebf 100644
--- a/lib/gitlab/graphql/authorize/authorize_resource.rb
+++ b/lib/gitlab/graphql/authorize/authorize_resource.rb
@@ -45,8 +45,8 @@ module Gitlab
           end
         end
 
-        def find_object(*args)
-          raise NotImplementedError, "Implement #find_object in #{self.class.name}"
+        def find_object(id:)
+          GitlabSchema.find_by_gid(id)
         end
 
         def authorized_find!(*args, **kwargs)
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)