diff options
| author | José Valim <jose.valim@gmail.com> | 2009-11-02 23:46:00 -0200 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2009-11-02 23:46:00 -0200 |
| commit | d002826e54415a340e55fdbf363d005faebf8fc5 (patch) | |
| tree | 431146dfb0b15c4507fd49bb7d6f18bd40ccf839 /railties/builtin | |
| parent | 9ba83cce0318fa5051764f4a16c286adf30169e2 (diff) | |
| parent | 14370e1aab6ddfb5b86cf50bd7e5abcebae0684c (diff) | |
| download | rails-d002826e54415a340e55fdbf363d005faebf8fc5.tar.gz rails-d002826e54415a340e55fdbf363d005faebf8fc5.tar.bz2 rails-d002826e54415a340e55fdbf363d005faebf8fc5.zip | |
Merge branch 'master' of git://github.com/rails/rails
Diffstat (limited to 'railties/builtin')
| -rw-r--r-- | railties/builtin/rails_info/rails/info.rb | 4 |
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). |