mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
Back off cleanpath to be symlink friendly. Closes #2533
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2768 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
This commit is contained in:
parent
435f0c254e
commit
e0332f59e4
2 changed files with 4 additions and 2 deletions
|
@ -1,5 +1,7 @@
|
||||||
*SVN*
|
*SVN*
|
||||||
|
|
||||||
|
* Back off cleanpath to be symlink friendly. Closes #2533 [Nicholas Seckar]
|
||||||
|
|
||||||
* Load rake task files in alphabetical order so you can build dependencies and count on them #2554 [Blair Zajac]
|
* Load rake task files in alphabetical order so you can build dependencies and count on them #2554 [Blair Zajac]
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -2,7 +2,7 @@ unless defined?(RAILS_ROOT)
|
||||||
root_path = File.join(File.dirname(__FILE__), '..')
|
root_path = File.join(File.dirname(__FILE__), '..')
|
||||||
unless RUBY_PLATFORM =~ /mswin32/
|
unless RUBY_PLATFORM =~ /mswin32/
|
||||||
require 'pathname'
|
require 'pathname'
|
||||||
root_path = Pathname.new(root_path).cleanpath.to_s
|
root_path = Pathname.new(root_path).cleanpath(true).to_s
|
||||||
end
|
end
|
||||||
RAILS_ROOT = root_path
|
RAILS_ROOT = root_path
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in a new issue