diff options
-rw-r--r-- | railties/CHANGELOG | 5 | ||||
-rw-r--r-- | railties/environments/shared.rb | 2 | ||||
-rw-r--r-- | railties/environments/shared_for_gem.rb | 2 |
3 files changed, 7 insertions, 2 deletions
diff --git a/railties/CHANGELOG b/railties/CHANGELOG index 13dbd44948..f5f8e3296a 100644 --- a/railties/CHANGELOG +++ b/railties/CHANGELOG @@ -1,3 +1,8 @@ +*SVN* + +* File.expand_path in config/environment.rb would fail when dealing with symlinked public directories [mjobin]. + + *0.9.1* * Upgraded to Action Pack 1.0.1 for important bug fix diff --git a/railties/environments/shared.rb b/railties/environments/shared.rb index f47586ebcc..cd4d5b205a 100644 --- a/railties/environments/shared.rb +++ b/railties/environments/shared.rb @@ -1,4 +1,4 @@ -RAILS_ROOT = File.expand_path(File.dirname(__FILE__) + "/../") +RAILS_ROOT = File.dirname(__FILE__) + "/../" RAILS_ENV = ENV['RAILS_ENV'] || 'development' diff --git a/railties/environments/shared_for_gem.rb b/railties/environments/shared_for_gem.rb index c8aa36a505..e82a6344fe 100644 --- a/railties/environments/shared_for_gem.rb +++ b/railties/environments/shared_for_gem.rb @@ -1,4 +1,4 @@ -RAILS_ROOT = File.expand_path(File.dirname(__FILE__) + "/../") +RAILS_ROOT = File.dirname(__FILE__) + "/../" RAILS_ENV = ENV['RAILS_ENV'] || 'development' |