aboutsummaryrefslogtreecommitdiffstats
path: root/railties/builtin
diff options
context:
space:
mode:
authorCarl Lerche <carllerche@mac.com>2009-10-16 12:49:39 -0700
committerCarl Lerche <carllerche@mac.com>2009-10-16 12:51:02 -0700
commit2110a524a4913815d036786aa01319fd67db0ee2 (patch)
treef87858a81ac61642827c0617cad9eeceb44e8707 /railties/builtin
parent6094e6516951444f8c3d6bb31f171af9fe96a02f (diff)
downloadrails-2110a524a4913815d036786aa01319fd67db0ee2.tar.gz
rails-2110a524a4913815d036786aa01319fd67db0ee2.tar.bz2
rails-2110a524a4913815d036786aa01319fd67db0ee2.zip
Deprecate RAILS_ROOT in favor of Rails.root (which proxies to the application's object root)
Diffstat (limited to 'railties/builtin')
-rw-r--r--railties/builtin/rails_info/rails/info.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/railties/builtin/rails_info/rails/info.rb b/railties/builtin/rails_info/rails/info.rb
index 48d89ad06a..c3784cff32 100644
--- a/railties/builtin/rails_info/rails/info.rb
+++ b/railties/builtin/rails_info/rails/info.rb
@@ -75,7 +75,7 @@ module Rails
protected
def rails_vendor_root
- @rails_vendor_root ||= "#{RAILS_ROOT}/vendor/rails"
+ @rails_vendor_root ||= "#{Rails.root}/vendor/rails"
end
def git_info
@@ -124,7 +124,7 @@ module Rails
# The application's location on the filesystem.
property 'Application root' do
- File.expand_path(RAILS_ROOT)
+ File.expand_path(Rails.root)
end
# The current Rails environment (development, test, or production).