Add latest changes from gitlab-org/gitlab@15-1-stable-eev15.1.0-rc42

1 files changed, 6 insertions, 4 deletions

diff --git a/app/graphql/types/query_type.rb b/app/graphql/types/query_type.rb
index 01b1a71896a..46d121f6552 100644
--- a/app/graphql/types/query_type.rb
+++ b/app/graphql/types/query_type.rb
@@ -52,6 +52,7 @@ module Types
 
     field :milestone, ::Types::MilestoneType,
           null: true,
+          extras: [:lookahead],
           description: 'Find a milestone.' do
             argument :id, ::Types::GlobalIDType[Milestone], required: true, description: 'Find a milestone by its ID.'
           end
@@ -90,8 +91,8 @@ module Types
     field :work_item, Types::WorkItemType,
           null: true,
           resolver: Resolvers::WorkItemResolver,
-          description: 'Find a work item. Returns `null` if `work_items` feature flag is disabled.' \
-                       ' The feature is experimental and is subject to change without notice.'
+          deprecated: { milestone: '15.1', reason: :alpha },
+          description: 'Find a work item. Returns `null` if `work_items` feature flag is disabled.'
 
     field :merge_request, Types::MergeRequestType,
           null: true,
@@ -156,8 +157,9 @@ module Types
       GitlabSchema.find_by_gid(id)
     end
 
-    def milestone(id:)
-      GitlabSchema.find_by_gid(id)
+    def milestone(id:, lookahead:)
+      preloads = [:releases] if lookahead.selects?(:releases)
+      Gitlab::Graphql::Loaders::BatchModelLoader.new(id.model_class, id.model_id, preloads).find
     end
 
     def container_repository(id:)