Feature flag resetting ci usage for all namespaces

app/models/project_statistics.rb

@@ -18,6 +18,7 @@ class ProjectStatistics < ApplicationRecord
   scope :for_project_ids, ->(project_ids) { where(project_id: project_ids) }
 
   scope :for_namespaces, -> (namespaces) { where(namespace: namespaces) }
+  scope :with_any_ci_minutes_used, -> { where.not(shared_runners_seconds: 0) }
 
   def total_repository_size
     repository_size + lfs_objects_size

ee/app/models/namespace_statistics.rb

@@ -6,6 +6,7 @@ class NamespaceStatistics < ApplicationRecord
   validates :namespace, presence: true
 
   scope :for_namespaces, -> (namespaces) { where(namespace: namespaces) }
+  scope :with_any_ci_minutes_used, -> { where.not(shared_runners_seconds: 0) }
 
   def shared_runners_minutes(include_extra: true)
     minutes = shared_runners_seconds.to_i / 60

ee/app/services/ci/minutes/batch_reset_service.rb

@@ -80,13 +80,13 @@ module Ci
       end
 
       def reset_shared_runners_seconds!(namespaces)
-        NamespaceStatistics
-          .for_namespaces(namespaces)
-          .update_all(shared_runners_seconds: 0, shared_runners_seconds_last_reset: Time.current)
+        namespace_relation = NamespaceStatistics.for_namespaces(namespaces)
+        namespace_relation = namespace_relation.with_any_ci_minutes_used unless ::Gitlab::Ci::Features.reset_ci_minutes_for_all_namespaces?
+        namespace_relation.update_all(shared_runners_seconds: 0, shared_runners_seconds_last_reset: Time.current)
 
-        ::ProjectStatistics
-          .for_namespaces(namespaces)
-          .update_all(shared_runners_seconds: 0, shared_runners_seconds_last_reset: Time.current)
+        project_relation = ::ProjectStatistics.for_namespaces(namespaces)
+        project_relation = project_relation.with_any_ci_minutes_used unless ::Gitlab::Ci::Features.reset_ci_minutes_for_all_namespaces?
+        project_relation.update_all(shared_runners_seconds: 0, shared_runners_seconds_last_reset: Time.current)
       end
 
       def reset_ci_minutes_notifications!(namespaces)

lib/gitlab/ci/features.rb

@@ -85,6 +85,10 @@ module Gitlab
       def self.job_entry_matches_all_keys?
         ::Feature.enabled?(:ci_job_entry_matches_all_keys)
       end
+
+      def self.reset_ci_minutes_for_all_namespaces?
+        ::Feature.enabled?(:reset_ci_minutes_for_all_namespaces, default_enabled: false)
+      end
     end
   end
 end