Merge branch '210570-fix-feature-flags-dependencies' into 'master'

Use different FF in shared runners limit check

See merge request gitlab-org/gitlab!30164

ee/app/models/ee/ci/build.rb

@@ -36,7 +36,7 @@ module EE
       end
 
       def shared_runners_minutes_limit_enabled?
-        if ::Feature.enabled?(:ci_minutes_enforce_quota_for_public_projects)
+        if ::Feature.enabled?(:ci_minutes_track_for_public_projects, project.shared_runners_limit_namespace)
           project.shared_runners_minutes_limit_enabled? && runner&.minutes_cost_factor(project.visibility_level)&.positive?
         else
           legacy_shared_runners_minutes_limit_enabled?

ee/app/models/ee/project.rb

@@ -280,7 +280,7 @@ module EE
     end
 
     def shared_runners_minutes_limit_enabled?
-      if ::Feature.enabled?(:ci_minutes_enforce_quota_for_public_projects)
+      if ::Feature.enabled?(:ci_minutes_track_for_public_projects, shared_runners_limit_namespace)
         shared_runners_enabled? &&
           shared_runners_limit_namespace.shared_runners_minutes_limit_enabled?
       else

ee/spec/models/ci/build_spec.rb

@@ -81,9 +81,9 @@ describe Ci::Build do
 
     it_behaves_like 'depends on runner presence and type'
 
-    context 'and :ci_minutes_enforce_quota_for_public_projects FF is disabled' do
+    context 'and :ci_minutes_track_for_public_projects FF is disabled' do
       before do
-        stub_feature_flags(ci_minutes_enforce_quota_for_public_projects: false)
+        stub_feature_flags(ci_minutes_track_for_public_projects: { enabled: false, thing: project.shared_runners_limit_namespace })
       end
 
       it_behaves_like 'depends on runner presence and type'

ee/spec/models/project_spec.rb

@@ -980,9 +980,9 @@ describe Project do
 
         it { is_expected.to be_truthy }
 
-        context 'and :ci_minutes_enforce_quota_for_public_projects FF is disabled' do
+        context 'and :ci_minutes_track_for_public_projects FF is disabled' do
           before do
-            stub_feature_flags(ci_minutes_enforce_quota_for_public_projects: false)
+            stub_feature_flags(ci_minutes_track_for_public_projects: { enabled: false, thing: project.shared_runners_limit_namespace })
           end
 
           it { is_expected.to be_falsey }