Add latest changes from gitlab-org/gitlab@master

1 files changed, 1 insertions, 5 deletions

diff --git a/app/graphql/resolvers/milestone_resolver.rb b/app/graphql/resolvers/milestone_resolver.rb
index 6c6513e0ee4..bcfbc63c31f 100644
--- a/app/graphql/resolvers/milestone_resolver.rb
+++ b/app/graphql/resolvers/milestone_resolver.rb
@@ -52,7 +52,7 @@ module Resolvers
     end
 
     def group_parameters(args)
-      return { group_ids: parent.id } unless include_descendants?(args)
+      return { group_ids: parent.id } unless args[:include_descendants].present?
 
       {
         group_ids: parent.self_and_descendants.public_or_visible_to_user(current_user).select(:id),
@@ -60,10 +60,6 @@ module Resolvers
       }
     end
 
-    def include_descendants?(args)
-      args[:include_descendants].present? && Feature.enabled?(:group_milestone_descendants, parent)
-    end
-
     def group_projects
       GroupProjectsFinder.new(
         group: parent,