diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2013-10-31 11:47:51 -0700 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2013-10-31 11:47:51 -0700 |
| commit | 4d4ff531b8807ee88a3fc46875c7e76f613956fb (patch) | |
| tree | 69ad1741462a5f9582a8b111a5cd7182a710f80c /railties/lib/rails/application | |
| parent | f7e0758714e645865361b5566253d3e7d896beff (diff) | |
| download | rails-4d4ff531b8807ee88a3fc46875c7e76f613956fb.tar.gz rails-4d4ff531b8807ee88a3fc46875c7e76f613956fb.tar.bz2 rails-4d4ff531b8807ee88a3fc46875c7e76f613956fb.zip | |
clean up some warnings on trunk ruby
Diffstat (limited to 'railties/lib/rails/application')
| -rw-r--r-- | railties/lib/rails/application/configuration.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/lib/rails/application/configuration.rb b/railties/lib/rails/application/configuration.rb index 7332444ab9..dd0b9c6d70 100644 --- a/railties/lib/rails/application/configuration.rb +++ b/railties/lib/rails/application/configuration.rb @@ -90,7 +90,7 @@ module Rails # Loads and returns the configuration of the database. def database_configuration yaml = paths["config/database"].first - if File.exists?(yaml) + if File.exist?(yaml) require "erb" YAML.load ERB.new(IO.read(yaml)).result elsif ENV['DATABASE_URL'] |