Disable burndown charts when issuable weights are unlicensed

app/controllers/projects/milestones_controller.rb

@@ -45,7 +45,8 @@ class Projects::MilestonesController < Projects::ApplicationController
   end
 
   def show
-    if @project.feature_available?(:burndown_charts, current_user)
+    if @project.feature_available?(:burndown_charts, current_user) &&
+        @project.feature_available?(:issue_weights, current_user)
       @burndown = Burndown.new(@milestone)
     end
   end

app/helpers/milestones_helper.rb

@@ -134,14 +134,16 @@ module MilestonesHelper
   end
 
   def can_generate_chart?(burndown)
-    return unless @project.feature_available?(:burndown_charts, current_user)
+    return unless @project.feature_available?(:burndown_charts, current_user) &&
+        @project.feature_available?(:issue_weights, current_user)
 
     burndown&.valid? && !burndown&.empty?
   end
 
   def show_burndown_placeholder?(warning)
     return false if cookies['hide_burndown_message'].present?
-    return false unless @project.feature_available?(:burndown_charts, current_user)
+    return false unless @project.feature_available?(:burndown_charts, current_user) &&
+        @project.feature_available?(:issue_weights, current_user)
 
     warning.nil? && can?(current_user, :admin_milestone, @project)
   end

spec/features/projects/milestones/ee/milestone_spec.rb

@@ -88,11 +88,7 @@ describe 'Milestones on EE', feature: true do
       end
     end
 
-    context 'with the burndown chart feature disabled' do
-      before do
-        stub_licensed_features(burndown_charts: false)
-      end
-
+    shared_examples 'burndown charts disabled' do
       it 'has a link to upgrade to Bronze when checking the namespace plan' do
         # Not using `stub_application_setting` because the method is prepended in
         # `EE::ApplicationSetting` which breaks when using `any_instance`
@@ -118,6 +114,22 @@ describe 'Milestones on EE', feature: true do
         end
       end
     end
+
+    context 'with the burndown chart feature disabled' do
+      before do
+        stub_licensed_features(burndown_charts: false)
+      end
+
+      include_examples 'burndown charts disabled'
+    end
+
+    context 'with the issuable weights feature disabled' do
+      before do
+        stub_licensed_features(issue_weights: false)
+      end
+
+      include_examples 'burndown charts disabled'
+    end
   end
 
   context 'milestone summary' do