diff options
| author | igor04 <igor.s04g@gmail.com> | 2019-07-12 19:22:36 +0300 |
|---|---|---|
| committer | igor04 <igor.s04g@gmail.com> | 2019-07-12 19:23:09 +0300 |
| commit | 0fa41f72fcb773bd32c7ce77f9df33e328ff0e44 (patch) | |
| tree | 86703a55c6185d04f5da1e2bf4b4f41088d09a8a /railties/lib | |
| parent | 141b30630cc9ec15dd5aa88e062383adedd335de (diff) | |
| download | rails-0fa41f72fcb773bd32c7ce77f9df33e328ff0e44.tar.gz rails-0fa41f72fcb773bd32c7ce77f9df33e328ff0e44.tar.bz2 rails-0fa41f72fcb773bd32c7ce77f9df33e328ff0e44.zip | |
Prevent exception of loading database yaml with blank config file [closes: #36661]
Diffstat (limited to 'railties/lib')
| -rw-r--r-- | railties/lib/rails/application/configuration.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/lib/rails/application/configuration.rb b/railties/lib/rails/application/configuration.rb index f5456f4916..5b3e96cbd4 100644 --- a/railties/lib/rails/application/configuration.rb +++ b/railties/lib/rails/application/configuration.rb @@ -209,7 +209,7 @@ module Rails yaml = Pathname.new(path) erb = DummyERB.new(yaml.read) - YAML.load(erb.result) + YAML.load(erb.result) || {} else {} end |