Commit fadd6adb authored by Kushal Pandya's avatar Kushal Pandya

Merge branch '343890-show-inherited-milestones-in-roadmap' into 'master'

Added ancestor milestones to roadmaps

See merge request gitlab-org/gitlab!78938
parents bd3bbc05 edbf7ea1
...@@ -3,11 +3,17 @@ query groupMilestonesEE( ...@@ -3,11 +3,17 @@ query groupMilestonesEE(
$state: MilestoneStateEnum $state: MilestoneStateEnum
$timeframe: Timeframe $timeframe: Timeframe
$includeDescendants: Boolean $includeDescendants: Boolean
$includeAncestors: Boolean
) { ) {
group(fullPath: $fullPath) { group(fullPath: $fullPath) {
id id
name name
milestones(state: $state, includeDescendants: $includeDescendants, timeframe: $timeframe) { milestones(
state: $state
includeDescendants: $includeDescendants
includeAncestors: $includeAncestors
timeframe: $timeframe
) {
edges { edges {
node { node {
id id
......
...@@ -233,6 +233,7 @@ export const fetchGroupMilestones = ( ...@@ -233,6 +233,7 @@ export const fetchGroupMilestones = (
timeframe: defaultTimeframe || timeframe, timeframe: defaultTimeframe || timeframe,
}), }),
includeDescendants: true, includeDescendants: true,
includeAncestors: true,
...filterParams, ...filterParams,
}; };
......
...@@ -500,6 +500,7 @@ describe('Roadmap Vuex Actions', () => { ...@@ -500,6 +500,7 @@ describe('Roadmap Vuex Actions', () => {
end: '2018-12-31', end: '2018-12-31',
}, },
includeDescendants: true, includeDescendants: true,
includeAncestors: true,
}; };
}); });
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment