From 74165eb6acaca98d4da13409c4e5b5ecc9d260f7 Mon Sep 17 00:00:00 2001 From: Nicholas Seckar Date: Tue, 8 Aug 2006 21:21:04 +0000 Subject: New dependencies implementation git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4728 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- railties/CHANGELOG | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'railties/CHANGELOG') 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] -- cgit v1.2.3