aboutsummaryrefslogtreecommitdiffstats
path: root/railties/environments
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2005-03-07 01:07:06 +0000
committerDavid Heinemeier Hansson <david@loudthinking.com>2005-03-07 01:07:06 +0000
commit239ec08c001b5588914f08ec8063939ad143067a (patch)
tree4151ac6daafc10fe29269e1a8cfcd143d9930837 /railties/environments
parent620d3a3749cf55ad9fcd9193a88da34d9c4624d4 (diff)
downloadrails-239ec08c001b5588914f08ec8063939ad143067a.tar.gz
rails-239ec08c001b5588914f08ec8063939ad143067a.tar.bz2
rails-239ec08c001b5588914f08ec8063939ad143067a.zip
More fixes for symlinked setups #793 [phantom]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@871 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'railties/environments')
-rw-r--r--railties/environments/shared.rb4
-rw-r--r--railties/environments/shared_for_gem.rb4
2 files changed, 4 insertions, 4 deletions
diff --git a/railties/environments/shared.rb b/railties/environments/shared.rb
index 2e4e4ade13..f983c74786 100644
--- a/railties/environments/shared.rb
+++ b/railties/environments/shared.rb
@@ -64,8 +64,8 @@ end
ActionController::Routing::Routes.reload
Controllers = Dependencies::LoadingModule.root(
- File.expand_path(File.join(RAILS_ROOT, 'app', 'controllers')),
- File.expand_path(File.join(RAILS_ROOT, 'components'))
+ File.join(RAILS_ROOT, 'app', 'controllers'),
+ File.join(RAILS_ROOT, 'components')
)
# Include your app's configuration here:
diff --git a/railties/environments/shared_for_gem.rb b/railties/environments/shared_for_gem.rb
index ee77e3341a..db6c797795 100644
--- a/railties/environments/shared_for_gem.rb
+++ b/railties/environments/shared_for_gem.rb
@@ -59,8 +59,8 @@ end
ActionController::Routing::Routes.reload
Controllers = Dependencies::LoadingModule.root(
- File.expand_path(File.join(RAILS_ROOT, 'app', 'controllers')),
- File.expand_path(File.join(RAILS_ROOT, 'components'))
+ File.join(RAILS_ROOT, 'app', 'controllers'),
+ File.join(RAILS_ROOT, 'components')
)
# Include your app's configuration here: