Merge branch '352331-roadmap-settings-include-subgroup-group-milestones' into 'master'

Roadmap settings - Include subgroup in group milestones

See merge request gitlab-org/gitlab!80685

ee/app/assets/javascripts/roadmap/components/roadmap_shell.vue

@@ -48,7 +48,7 @@ export default {
     milestonesToShow() {
       switch (this.milestonesType) {
         case MILESTONES_GROUP:
-          return this.milestones.filter((m) => m.groupMilestone && !m.subgroupMilestone);
+          return this.milestones.filter((m) => m.groupMilestone);
         case MILESTONES_SUBGROUP:
           return this.milestones.filter((m) => m.subgroupMilestone);
         case MILESTONES_PROJECT:

ee/spec/features/groups/group_roadmap_spec.rb

@@ -273,7 +273,7 @@ RSpec.describe 'group epic roadmap', :js do
         it 'renders milestones based on filter' do
           milestones_counts = {
             'Show all milestones' => 4,
-            'Show group milestones' => 1,
+            'Show group milestones' => 2, # group & subgroup
             'Show sub-group milestones' => 1,
             'Show project milestones' => 2
           }