From ae01c921fb12021e46407f6d17ff68528156017d Mon Sep 17 00:00:00 2001 From: eileencodes Date: Thu, 22 Feb 2018 15:40:13 -0500 Subject: Revert "Merge pull request #32075 from eileencodes/delete-default-configuration" This reverts commit 16f279ebd474626577ced858e3626ac4535a33df, reversing changes made to 6c6a30a7c357ce1eafa093d77d2b08684fe50887. The config can be named anything, not just default (although all generated apps will be named default). We can't just delete configs that don't have a database because that will break three-tier configs. Oh well. --- railties/lib/rails/application/configuration.rb | 1 - 1 file changed, 1 deletion(-) (limited to 'railties/lib') diff --git a/railties/lib/rails/application/configuration.rb b/railties/lib/rails/application/configuration.rb index 8af364f1e4..b42ffe50d8 100644 --- a/railties/lib/rails/application/configuration.rb +++ b/railties/lib/rails/application/configuration.rb @@ -179,7 +179,6 @@ 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 -- cgit v1.2.3