aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/test/option_merger_test.rb
diff options
context:
space:
mode:
authorEileen M. Uchitelle <eileencodes@users.noreply.github.com>2019-07-15 09:11:36 -0400
committerGitHub <noreply@github.com>2019-07-15 09:11:36 -0400
commit79ef8310bec5eb2e3d05134b36bccda821703652 (patch)
treef2166e8359f06787a8d5e240322df949e66e0226 /activesupport/test/option_merger_test.rb
parentb4c715fe63d81b0dd0f7c10ac95bf17b0f897c7c (diff)
parent0fa41f72fcb773bd32c7ce77f9df33e328ff0e44 (diff)
downloadrails-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 'activesupport/test/option_merger_test.rb')
0 files changed, 0 insertions, 0 deletions