diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2006-08-09 02:22:04 +0000 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2006-08-09 02:22:04 +0000 |
| commit | e448b340ab7be7290fe3b2e5eebe609ba0f6b5da (patch) | |
| tree | 38df9efb125924a3d6ea94a4a07780f113d43ae5 /railties/CHANGELOG | |
| parent | f06cae36524a579f3cd1f2ab78e0b5dd8361feab (diff) | |
| download | rails-e448b340ab7be7290fe3b2e5eebe609ba0f6b5da.tar.gz rails-e448b340ab7be7290fe3b2e5eebe609ba0f6b5da.tar.bz2 rails-e448b340ab7be7290fe3b2e5eebe609ba0f6b5da.zip | |
Nested controller scaffolding also nests the generated layout.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4735 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'railties/CHANGELOG')
| -rw-r--r-- | railties/CHANGELOG | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/railties/CHANGELOG b/railties/CHANGELOG index 413639a61d..795f6de2ff 100644 --- a/railties/CHANGELOG +++ b/railties/CHANGELOG @@ -1,16 +1,16 @@ *SVN* -<<<<<<< .mine +* Nested controller scaffolding also nests the generated layout. [iain d broadf +oot] + * 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] |