Add latest changes from gitlab-org/gitlab@15-0-stable-eev15.0.0-rc42

4 files changed, 5 insertions, 54 deletions

diff --git a/lib/gitlab/graphql/find_argument_in_parent.rb b/lib/gitlab/graphql/find_argument_in_parent.rb
deleted file mode 100644
index 1f83f8fce7a..00000000000
--- a/lib/gitlab/graphql/find_argument_in_parent.rb
+++ /dev/null
@@ -1,32 +0,0 @@
-# frozen_string_literal: true
-
-module Gitlab
-  module Graphql
-    module FindArgumentInParent
-      # Searches up the GraphQL AST and returns the first matching argument
-      # passed to a node
-      def self.find(parent, argument, limit_depth: nil)
-        argument = argument.to_s.camelize(:lower).to_sym
-        depth = 0
-
-        while parent.respond_to?(:parent)
-          args = node_args(parent)
-          return args[argument] if args.key?(argument)
-
-          depth += 1
-          return if limit_depth && depth >= limit_depth
-
-          parent = parent.parent
-        end
-      end
-
-      class << self
-        private
-
-        def node_args(node)
-          node.irep_node.arguments
-        end
-      end
-    end
-  end
-end
diff --git a/lib/gitlab/graphql/global_id_compatibility.rb b/lib/gitlab/graphql/global_id_compatibility.rb
deleted file mode 100644
index a96e4c4b976..00000000000
--- a/lib/gitlab/graphql/global_id_compatibility.rb
+++ /dev/null
@@ -1,20 +0,0 @@
-# frozen_string_literal: true
-
-module Gitlab
-  module Graphql
-    module GlobalIDCompatibility
-      # TODO: remove this module once the compatibility layer is no longer needed.
-      # See: https://gitlab.com/gitlab-org/gitlab/-/issues/257883
-      def coerce_global_id_arguments!(args)
-        global_id_arguments = self.class.arguments.values.select do |arg|
-          arg.type.is_a?(Class) && arg.type <= ::Types::GlobalIDType
-        end
-
-        global_id_arguments.each do |arg|
-          k = arg.keyword
-          args[k] &&= arg.type.coerce_isolated_input(args[k])
-        end
-      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 bf9b73d918a..9beb40ddd7e 100644
--- a/lib/gitlab/graphql/pagination/keyset/generic_keyset_pagination.rb
+++ b/lib/gitlab/graphql/pagination/keyset/generic_keyset_pagination.rb
@@ -68,7 +68,7 @@ module Gitlab
 
           def items
             original_items = super
-            return original_items if Feature.disabled?(:new_graphql_keyset_pagination, default_enabled: :yaml) || Gitlab::Pagination::Keyset::Order.keyset_aware?(original_items)
+            return original_items if Feature.disabled?(:new_graphql_keyset_pagination) || Gitlab::Pagination::Keyset::Order.keyset_aware?(original_items)
 
             strong_memoize(:generic_keyset_pagination_items) do
               rebuilt_items_with_keyset_order, success = Gitlab::Pagination::Keyset::SimpleOrderBuilder.build(original_items)
diff --git a/lib/gitlab/graphql/queries.rb b/lib/gitlab/graphql/queries.rb
index 5d3a9245427..cf06a2729d9 100644
--- a/lib/gitlab/graphql/queries.rb
+++ b/lib/gitlab/graphql/queries.rb
@@ -240,6 +240,9 @@ module Gitlab
         end
       end
 
+      # TODO: some queries live under app/graphql/queries - we should look there if/when we add fragments there
+      # See: https://gitlab.com/gitlab-org/gitlab/-/issues/361079
+      # for fragments too.
       class Fragments
         def initialize(root, dir = 'app/assets/javascripts')
           @root = root
@@ -278,7 +281,7 @@ module Gitlab
 
       def self.all
         ['.', 'ee'].flat_map do |prefix|
-          find(Rails.root / prefix / 'app/assets/javascripts')
+          find(Rails.root / prefix / 'app/assets/javascripts') + find(Rails.root / prefix / 'app/graphql/queries')
         end
       end