diff options
Diffstat (limited to 'railties/lib/rails')
| -rw-r--r-- | railties/lib/rails/application/configuration.rb | 2 | ||||
| -rw-r--r-- | railties/lib/rails/generators/rails/app/templates/config/initializers/feature_policy.rb.tt | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/railties/lib/rails/application/configuration.rb b/railties/lib/rails/application/configuration.rb index 43c85fe16f..50d43ff69e 100644 --- a/railties/lib/rails/application/configuration.rb +++ b/railties/lib/rails/application/configuration.rb @@ -210,7 +210,7 @@ module Rails yaml = Pathname.new(path) erb = DummyERB.new(yaml.read) - YAML.load(erb.result) + YAML.load(erb.result) || {} else {} end diff --git a/railties/lib/rails/generators/rails/app/templates/config/initializers/feature_policy.rb.tt b/railties/lib/rails/generators/rails/app/templates/config/initializers/feature_policy.rb.tt index 355c7bd62a..a1c46695d2 100644 --- a/railties/lib/rails/generators/rails/app/templates/config/initializers/feature_policy.rb.tt +++ b/railties/lib/rails/generators/rails/app/templates/config/initializers/feature_policy.rb.tt @@ -7,5 +7,5 @@ # f.microphone :none # f.usb :none # f.fullscreen :self -# f.payment :self, "https://secure-example.com" +# f.payment :self, "https://secure.example.com" # end |