Feature flag check in Namespace#feature_available?

ee/app/models/ee/namespace.rb

@@ -72,6 +72,9 @@ module EE
     # for a given Namespace plan. This method should consider ancestor groups
     # being licensed.
     def feature_available?(feature)
+      # This feature might not be behind a feature flag at all, so default to true
+      return false unless ::Feature.enabled?(feature, default_enabled: true)
+
       available_features = strong_memoize(:feature_available) do
         Hash.new do |h, feature|
           h[feature] = load_feature_available(feature)

ee/spec/models/namespace_spec.rb

@@ -218,6 +218,22 @@ describe Namespace do
         is_expected.to be_falsy
       end
     end
+
+    context 'when feature is disabled by a feature flag' do
+      it 'returns false' do
+        stub_feature_flags(feature => false)
+
+        is_expected.to eq(false)
+      end
+    end
+
+    context 'when feature is enabled by a feature flag' do
+      it 'returns true' do
+        stub_feature_flags(feature => true)
+
+        is_expected.to eq(true)
+      end
+    end
   end
 
   describe '#max_active_pipelines' do