diff options
| -rw-r--r-- | railties/CHANGELOG | 2 | ||||
| -rw-r--r-- | railties/environments/boot.rb | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/railties/CHANGELOG b/railties/CHANGELOG index 7b661857b5..06c59619d3 100644 --- a/railties/CHANGELOG +++ b/railties/CHANGELOG @@ -1,5 +1,7 @@ *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] diff --git a/railties/environments/boot.rb b/railties/environments/boot.rb index b829644d1f..96aa96bc4e 100644 --- a/railties/environments/boot.rb +++ b/railties/environments/boot.rb @@ -2,7 +2,7 @@ unless defined?(RAILS_ROOT) root_path = File.join(File.dirname(__FILE__), '..') unless RUBY_PLATFORM =~ /mswin32/ require 'pathname' - root_path = Pathname.new(root_path).cleanpath.to_s + root_path = Pathname.new(root_path).cleanpath(true).to_s end RAILS_ROOT = root_path end @@ -14,4 +14,4 @@ else require 'initializer' end -Rails::Initializer.run(:set_load_path)
\ No newline at end of file +Rails::Initializer.run(:set_load_path) |