diff options
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/CHANGELOG | 2 | ||||
| -rw-r--r-- | railties/lib/dispatcher.rb | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/railties/CHANGELOG b/railties/CHANGELOG index f5831d3352..25ba0e9620 100644 --- a/railties/CHANGELOG +++ b/railties/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Minor tweak to dispatcher to use recognize instead of recognize!, as per the new routes. [Jamis Buck] + * Make "script/plugin install" work with svn+ssh URLs. [Sam Stephenson] * Added lib/ to the directories that will get application docs generated [DHH] diff --git a/railties/lib/dispatcher.rb b/railties/lib/dispatcher.rb index 721a367f71..6290be3774 100644 --- a/railties/lib/dispatcher.rb +++ b/railties/lib/dispatcher.rb @@ -35,7 +35,7 @@ class Dispatcher if cgi ||= new_cgi(output) request, response = ActionController::CgiRequest.new(cgi, session_options), ActionController::CgiResponse.new(cgi) prepare_application - ActionController::Routing::Routes.recognize!(request).process(request, response).out(output) + ActionController::Routing::Routes.recognize(request).process(request, response).out(output) end rescue Object => exception failsafe_response(output, '500 Internal Server Error', exception) do |