diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2009-08-09 18:39:44 +0100 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2009-08-09 18:39:44 +0100 |
| commit | 2e50110eac439f3d5d292f1519ae7c79991eb91a (patch) | |
| tree | 5ba10ebd6ddf0a7487754798993d3862ee9ec3b3 /railties/lib/rails | |
| parent | a7f09bc12236d9e7bdc2ee34d5fe3c782d6ad385 (diff) | |
| parent | bb1e1776914edf3be7e46b55036c18a64595f919 (diff) | |
| download | rails-2e50110eac439f3d5d292f1519ae7c79991eb91a.tar.gz rails-2e50110eac439f3d5d292f1519ae7c79991eb91a.tar.bz2 rails-2e50110eac439f3d5d292f1519ae7c79991eb91a.zip | |
Merge commit 'mainstream/master'
Diffstat (limited to 'railties/lib/rails')
| -rw-r--r-- | railties/lib/rails/configuration.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/railties/lib/rails/configuration.rb b/railties/lib/rails/configuration.rb index fe3cb67d3a..5cc4f80684 100644 --- a/railties/lib/rails/configuration.rb +++ b/railties/lib/rails/configuration.rb @@ -71,7 +71,8 @@ module Rails @paths.lib "lib", :load_path => true @paths.vendor "vendor", :load_path => true @paths.vendor.plugins "vendor/plugins" - @paths.cache "tmp/cache" + @paths.tmp "tmp" + @paths.tmp.cache "tmp/cache" @paths.config "config" @paths.config.locales "config/locales" @paths.config.environments "config/environments", :glob => "#{RAILS_ENV}.rb" |