Merge pull request #9358 from iwiznia/patch-1

Update railties/lib/rails/application/configuration.rb

1 files changed, 3 insertions, 3 deletions

diff --git a/railties/lib/rails/application/configuration.rb b/railties/lib/rails/application/configuration.rb
index 1b88b834c7..17763b39c5 100644
--- a/railties/lib/rails/application/configuration.rb
+++ b/railties/lib/rails/application/configuration.rb
@@ -97,9 +97,9 @@ module Rails
         self
       end
 
-      # Loads and returns the contents of the #database_configuration_file. The
-      # contents of the file are processed via ERB before being sent through
-      # YAML::load.
+      # Loads and returns the configuration of the database.
+      # First, looks at If ENV['DATABASE_URL'] if it's not present it uses the #paths["config/database"]
+      # The contents of the file are processed via ERB before being sent through YAML::load. 
       def database_configuration
         if ENV['DATABASE_URL']
           {Rails.env => ActiveRecord::ConnectionAdapters::ConnectionSpecification::Resolver.connection_url_to_hash(ENV['DATABASE_URL']).stringify_keys}