diff options
| -rw-r--r-- | actionpack/CHANGELOG | 4 | ||||
| -rw-r--r-- | railties/environments/shared.rb | 4 | ||||
| -rw-r--r-- | railties/environments/shared_for_gem.rb | 4 |
3 files changed, 5 insertions, 7 deletions
diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG index 3175e4a11a..76f691cc00 100644 --- a/actionpack/CHANGELOG +++ b/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) 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: |