Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
f2ba0cde
Commit
f2ba0cde
authored
Feb 15, 2022
by
Florie Guibert
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Roadmap settings - Include subgroup in group milestones
Behind `roadmap_settings` feature flag
parent
5a018bed
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
ee/app/assets/javascripts/roadmap/components/roadmap_shell.vue
...p/assets/javascripts/roadmap/components/roadmap_shell.vue
+1
-1
ee/spec/features/groups/group_roadmap_spec.rb
ee/spec/features/groups/group_roadmap_spec.rb
+1
-1
No files found.
ee/app/assets/javascripts/roadmap/components/roadmap_shell.vue
View file @
f2ba0cde
...
...
@@ -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
View file @
f2ba0cde
...
...
@@ -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
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment