diff options
| author | Xavier Noria <fxn@hashref.com> | 2010-04-14 01:00:03 -0700 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2010-04-14 01:00:03 -0700 |
| commit | 9a4fdff0af0ba05ad77096ce835aeb4bf343a53f (patch) | |
| tree | d4657c9e64fdc050695dd58cf419241ace32e7a6 /railties/lib | |
| parent | 2ff5f38abb4a44ed5356c34b40d30d446fb63408 (diff) | |
| parent | e090898c5e98e853828208343b3911a229563b62 (diff) | |
| download | rails-9a4fdff0af0ba05ad77096ce835aeb4bf343a53f.tar.gz rails-9a4fdff0af0ba05ad77096ce835aeb4bf343a53f.tar.bz2 rails-9a4fdff0af0ba05ad77096ce835aeb4bf343a53f.zip | |
Merge commit 'docrails/master'
Diffstat (limited to 'railties/lib')
| -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 7ce3494fa6..11bf6a6e72 100644 --- a/railties/lib/rails/application/configuration.rb +++ b/railties/lib/rails/application/configuration.rb @@ -53,7 +53,7 @@ module Rails paths.vendor.plugins "vendor/plugins" if File.exists?("#{root}/test/mocks/#{Rails.env}") - ActiveSupport::Deprecation.warn "\"RAILS_ROOT/test/mocks/#{Rails.env}\" won't be added " << + ActiveSupport::Deprecation.warn "\"Rails.root/test/mocks/#{Rails.env}\" won't be added " << "automatically to load paths anymore in future releases" paths.mocks_path "test/mocks", :load_path => true, :glob => Rails.env end |