From bf0495de58ed4a0f4f5b5e079c3e758d6b6b132c Mon Sep 17 00:00:00 2001 From: eileencodes Date: Tue, 20 Feb 2018 12:58:01 -0500 Subject: Delete default configuration Because of this default configuration we're constantly checking if the database exists when looping through configurations. This is unnecessary and we should just delete it before we need to loop through configurations. --- railties/lib/rails/application/configuration.rb | 1 + 1 file changed, 1 insertion(+) (limited to 'railties/lib/rails') diff --git a/railties/lib/rails/application/configuration.rb b/railties/lib/rails/application/configuration.rb index 46ad3557e3..2c00d92f8f 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 -- cgit v1.2.3