aboutsummaryrefslogtreecommitdiffstats
path: root/railties/CHANGELOG
diff options
context:
space:
mode:
authorNicholas Seckar <nseckar@gmail.com>2006-08-08 21:21:04 +0000
committerNicholas Seckar <nseckar@gmail.com>2006-08-08 21:21:04 +0000
commit74165eb6acaca98d4da13409c4e5b5ecc9d260f7 (patch)
tree024158d20563f34cca52a00b42aaa6c922777559 /railties/CHANGELOG
parent94a1309194fa5962e33d395ede14e94b237c54f5 (diff)
downloadrails-74165eb6acaca98d4da13409c4e5b5ecc9d260f7.tar.gz
rails-74165eb6acaca98d4da13409c4e5b5ecc9d260f7.tar.bz2
rails-74165eb6acaca98d4da13409c4e5b5ecc9d260f7.zip
New dependencies implementation
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4728 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'railties/CHANGELOG')
-rw-r--r--railties/CHANGELOG7
1 files changed, 7 insertions, 0 deletions
diff --git a/railties/CHANGELOG b/railties/CHANGELOG
index 50daa2f009..413639a61d 100644
--- a/railties/CHANGELOG
+++ b/railties/CHANGELOG
@@ -1,9 +1,16 @@
*SVN*
+<<<<<<< .mine
+* Add "require 'dispatcher'" to webrick server in the continuing quest to squash webrick weirdness. [Nicholas Seckar]
+
+* Add autoload_paths support to Initializer. [Nicholas Seckar]
+
+=======
* Fix Dispatcher.reset_application! so that AR subclasses are removed and Observers re-initialized *after* Reloadable classes are removed. Closes #5743. [Rick Olson]
* Clarify usage of script/plugin source. Closes #5344. [james.adam@gmail.com]
+>>>>>>> .r4727
* Add Dispatcher.to_prepare and config.to_prepare to provide a pre-request hook. [Nicholas Seckar]
* Tweak the Rails load order so observers are loaded after plugins, and reloaded in development mode. Closed #5279. [Rick Olson]