diff options
| author | Eileen M. Uchitelle <eileencodes@users.noreply.github.com> | 2019-07-15 09:11:36 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-15 09:11:36 -0400 |
| commit | 79ef8310bec5eb2e3d05134b36bccda821703652 (patch) | |
| tree | f2166e8359f06787a8d5e240322df949e66e0226 /railties/lib/rails | |
| parent | b4c715fe63d81b0dd0f7c10ac95bf17b0f897c7c (diff) | |
| parent | 0fa41f72fcb773bd32c7ce77f9df33e328ff0e44 (diff) | |
| download | rails-79ef8310bec5eb2e3d05134b36bccda821703652.tar.gz rails-79ef8310bec5eb2e3d05134b36bccda821703652.tar.bz2 rails-79ef8310bec5eb2e3d05134b36bccda821703652.zip | |
Merge pull request #36663 from igor04/load_database_yaml_fix
Prevent exception of loading database yaml with blank config file
Diffstat (limited to 'railties/lib/rails')
| -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 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 |