diff options
| author | Eileen M. Uchitelle <eileencodes@users.noreply.github.com> | 2018-02-21 16:32:31 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-21 16:32:31 -0500 |
| commit | 16f279ebd474626577ced858e3626ac4535a33df (patch) | |
| tree | bf15ff7c0af67908148ab97935785d30480e403c /railties | |
| parent | 6c6a30a7c357ce1eafa093d77d2b08684fe50887 (diff) | |
| parent | bf0495de58ed4a0f4f5b5e079c3e758d6b6b132c (diff) | |
| download | rails-16f279ebd474626577ced858e3626ac4535a33df.tar.gz rails-16f279ebd474626577ced858e3626ac4535a33df.tar.bz2 rails-16f279ebd474626577ced858e3626ac4535a33df.zip | |
Merge pull request #32075 from eileencodes/delete-default-configuration
Delete default configuration
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/lib/rails/application/configuration.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/railties/lib/rails/application/configuration.rb b/railties/lib/rails/application/configuration.rb index 1f765f302c..84595342b2 100644 --- a/railties/lib/rails/application/configuration.rb +++ b/railties/lib/rails/application/configuration.rb @@ -178,6 +178,7 @@ module Rails values.reverse_merge!(shared) end end + loaded_yaml.delete("default") Hash.new(shared).merge(loaded_yaml) elsif ENV["DATABASE_URL"] # Value from ENV['DATABASE_URL'] is set to default database connection |