From bb9975fbc746b7febe634aba447d2bca7b713740 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Sat, 18 Dec 2004 00:47:30 +0000 Subject: File.expand_path in config/environment.rb would fail when dealing with symlinked public directories [mjobin]. git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@208 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- railties/environments/shared.rb | 2 +- railties/environments/shared_for_gem.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'railties/environments') 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' -- cgit v1.2.3