Commit 94c9b387 authored by Nathan Friend's avatar Nathan Friend

Merge branch '212832-enable-milestones-in-roadmap-feature-flag' into 'master'

Remove milestones_in_roadmap feature flag

See merge request gitlab-org/gitlab!29641
parents 461ba773 4f52aaab
...@@ -40,16 +40,14 @@ export default { ...@@ -40,16 +40,14 @@ export default {
}, },
}, },
data() { data() {
const milestonesInRoadmap = gon.features && gon.features.milestonesInRoadmap;
return { return {
timeframeStartOffset: 0, timeframeStartOffset: 0,
milestonesInRoadmap,
}; };
}, },
computed: { computed: {
...mapState(['defaultInnerHeight']), ...mapState(['defaultInnerHeight']),
displayMilestones() { displayMilestones() {
return this.milestonesInRoadmap && this.milestones.length !== 0; return Boolean(this.milestones.length);
}, },
}, },
mounted() { mounted() {
......
...@@ -11,7 +11,6 @@ module Groups ...@@ -11,7 +11,6 @@ module Groups
before_action :persist_roadmap_layout, only: [:show] before_action :persist_roadmap_layout, only: [:show]
before_action do before_action do
push_frontend_feature_flag(:roadmap_buffered_rendering, @group) push_frontend_feature_flag(:roadmap_buffered_rendering, @group)
push_frontend_feature_flag(:milestones_in_roadmap, @group)
end end
# show roadmap for a group # show roadmap for a group
......
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