Skip to content
Browse files

More fixes for symlinked setups #793 [phantom]

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@871 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
1 parent 620d3a3 commit 239ec08c001b5588914f08ec8063939ad143067a @dhh dhh committed Mar 7, 2005
Showing with 5 additions and 7 deletions.
  1. +1 −3 actionpack/CHANGELOG
  2. +2 −2 railties/environments/shared.rb
  3. +2 −2 railties/environments/shared_for_gem.rb
View
4 actionpack/CHANGELOG
@@ -2,8 +2,6 @@
* Fixed that the routes.rb file wouldn't be found on symlinked setups due to File.expand_path #793 [piotr@t-p-l.com]
-* Fixed issues with caching root pages #734 [Nicholas Seckar]
-
* Changed ActiveRecordStore to use Marshal instead of YAML as the latter proved troublesome in persisting circular dependencies. Updating existing applications MUST clear their existing session table from data to start using this updated store #739 [Jamis Buck]
* Added shortcut :id assignment to render_component and friends (before you had to go through :params) #784 [Lucas Carlson]
@@ -32,7 +30,7 @@
* Added PATH_INFO access from the request that allows urls like the following to be interpreted by rails: http://www.example.com/dispatcher.cgi/controller/action -- that makes it possible to use rails as a CGI under lighttpd and would also allow (for example) Rublog to be ported to rails without breaking existing links to Rublog-powered blogs. #728 [Jamis Buck]
-* Fixed that caching the root would result in .html not index.html #731 [alisdair]
+* Fixed that caching the root would result in .html not index.html #731, #734 [alisdair/Nicholas Seckar]
*1.5.0* (24th February, 2005)
View
4 railties/environments/shared.rb
@@ -64,8 +64,8 @@
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:
View
4 railties/environments/shared_for_gem.rb
@@ -59,8 +59,8 @@
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:

0 comments on commit 239ec08

Please sign in to comment.
Something went wrong with that request. Please try again.