diff options
Diffstat (limited to 'actionpack/CHANGELOG')
| -rw-r--r-- | actionpack/CHANGELOG | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG index fae6400849..ff636b7984 100644 --- a/actionpack/CHANGELOG +++ b/actionpack/CHANGELOG @@ -1,9 +1,12 @@ *SVN* +* Add controller_paths variable to Routing. [Nicholas Seckar] + * Fix assert_redirected_to issue with named routes for module controllers. [Rick Olson] * Tweak RoutingError message to show option diffs, not just missing named route significant keys. [Rick Olson] +>>>>>>> .r4761 * Invoke method_missing directly on hidden actions. Closes #3030. [Nicholas Seckar] * Require Tempfile explicitly for TestUploadedFile due to changes in class auto loading. [Rick Olson] |