Merge branch '218434-set-ci-minutes-ffs-default-enabled' into 'master'

Enable CI Minutes-related FFs by default

See merge request gitlab-org/gitlab!32581

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_track_for_public_projects, project.shared_runners_limit_namespace)
+        if ::Feature.enabled?(:ci_minutes_track_for_public_projects, project.shared_runners_limit_namespace, default_enabled: true)
           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

@@ -91,7 +91,7 @@ module EE
       has_many :sourced_pipelines, class_name: 'Ci::Sources::Project', foreign_key: :source_project_id
 
       scope :with_shared_runners_limit_enabled, -> do
-        if ::Feature.enabled?(:ci_minutes_enforce_quota_for_public_projects) &&
+        if ::Feature.enabled?(:ci_minutes_enforce_quota_for_public_projects, default_enabled: true) &&
             ::Ci::Runner.has_shared_runners_with_non_zero_public_cost?
           with_shared_runners
         else
@@ -276,7 +276,7 @@ module EE
     end
 
     def shared_runners_minutes_limit_enabled?
-      if ::Feature.enabled?(:ci_minutes_track_for_public_projects, shared_runners_limit_namespace)
+      if ::Feature.enabled?(:ci_minutes_track_for_public_projects, shared_runners_limit_namespace, default_enabled: true)
         shared_runners_enabled? &&
           shared_runners_limit_namespace.shared_runners_minutes_limit_enabled?
       else

ee/app/services/ee/ci/register_job_service.rb

@@ -28,7 +28,7 @@ module EE
       def builds_for_shared_runner
         return super unless shared_runner_build_limits_feature_enabled?
 
-        if ::Feature.enabled?(:ci_minutes_enforce_quota_for_public_projects)
+        if ::Feature.enabled?(:ci_minutes_enforce_quota_for_public_projects, default_enabled: true)
           enforce_minutes_based_on_cost_factors(super)
         else
           legacy_enforce_minutes_for_non_public_projects(super)

ee/app/services/update_build_minutes_service.rb

@@ -6,7 +6,7 @@ class UpdateBuildMinutesService < BaseService
     return unless build.complete?
     return unless build.duration&.positive?
 
-    if ::Feature.enabled?(:ci_minutes_track_for_public_projects, namespace)
+    if ::Feature.enabled?(:ci_minutes_track_for_public_projects, namespace, default_enabled: true)
       count_projects_based_on_cost_factors(build)
     else
       legacy_count_non_public_projects(build)

ee/changelogs/unreleased/218434-set-ci-minutes-ffs-default-enabled.yml

+---
+title: Enable CI Minutes-related Feature Flags by default
+merge_request: 32581
+author:
+type: changed