1 files changed, 10 insertions, 1 deletions
diff --git a/railties/lib/rails/application/configuration.rb b/railties/lib/rails/application/configuration.rb
index f5456f4916..50d43ff69e 100644
--- a/railties/lib/rails/application/configuration.rb
+++ b/railties/lib/rails/application/configuration.rb
@@ -69,6 +69,7 @@ module Rails
         @autoloader                              = :classic
         @disable_sandbox                         = false
         @add_autoload_paths_to_load_path         = true
+        @feature_policy                          = nil
       end
 
       def load_defaults(target_version)
@@ -209,7 +210,7 @@ module Rails
           yaml = Pathname.new(path)
           erb = DummyERB.new(yaml.read)
 
-          YAML.load(erb.result)
+          YAML.load(erb.result) || {}
         else
           {}
         end
@@ -301,6 +302,14 @@ module Rails
         end
       end
 
+      def feature_policy(&block)
+        if block_given?
+          @feature_policy = ActionDispatch::FeaturePolicy.new(&block)
+        else
+          @feature_policy
+        end
+      end
+
       def autoloader=(autoloader)
         case autoloader
         when :classic