diff options
Diffstat (limited to 'railties/lib/rails/application/configuration.rb')
| -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 b42ffe50d8..1bdaf91c46 100644 --- a/railties/lib/rails/application/configuration.rb +++ b/railties/lib/rails/application/configuration.rb @@ -179,6 +179,7 @@ module Rails values.reverse_merge!(shared) end end + loaded_yaml.reject! { |_, values| !values["database"] } Hash.new(shared).merge(loaded_yaml) elsif ENV["DATABASE_URL"] # Value from ENV['DATABASE_URL'] is set to default database connection |