1 files changed, 14 insertions, 8 deletions
diff --git a/lib/feature/gitaly.rb b/lib/feature/gitaly.rb
index 33868e49f14..d7a8f8a0b9e 100644
--- a/lib/feature/gitaly.rb
+++ b/lib/feature/gitaly.rb
@@ -1,24 +1,30 @@
+# frozen_string_literal: true
+
+require 'set'
+
 class Feature
   class Gitaly
+    # Server feature flags should use '_' to separate words.
+    # CATFILE_CACHE sets an incorrect example
     CATFILE_CACHE = 'catfile-cache'.freeze
 
-    # Server feature flags should use '_' to separate words.
     SERVER_FEATURE_FLAGS = [CATFILE_CACHE].freeze
+    DEFAULT_ON_FLAGS = Set.new([CATFILE_CACHE]).freeze
 
     class << self
       def enabled?(feature_flag)
-        Feature::FlipperFeature.table_exists? && Feature.enabled?("gitaly_#{feature_flag}")
+        return false unless Feature::FlipperFeature.table_exists?
+
+        default_on = DEFAULT_ON_FLAGS.include?(feature_flag)
+        Feature.enabled?("gitaly_#{feature_flag}", default_enabled: default_on)
       rescue ActiveRecord::NoDatabaseError
         false
       end
 
       def server_feature_flags
-        @server_feature_flags ||=
-          begin
-            SERVER_FEATURE_FLAGS.map do |f|
-              ["gitaly-feature-#{f.tr('_', '-')}", enabled?(f).to_s]
-            end.to_h
-          end
+        SERVER_FEATURE_FLAGS.map do |f|
+          ["gitaly-feature-#{f.tr('_', '-')}", enabled?(f).to_s]
+        end.to_h
       end
     end
   end