diff options
| author | Joshua Peek <josh@joshpeek.com> | 2009-12-16 16:11:42 -0600 |
|---|---|---|
| committer | Joshua Peek <josh@joshpeek.com> | 2009-12-16 16:11:42 -0600 |
| commit | 7217d64f615ec064f15c9b2999e98e54997fe67c (patch) | |
| tree | 922274fc37bcbe5de6fe11dc4cc0bb66c0c29a11 /actionpack/lib | |
| parent | 7ee5843c3cedfe36a680d5b28aa31eef45296c50 (diff) | |
| download | rails-7217d64f615ec064f15c9b2999e98e54997fe67c.tar.gz rails-7217d64f615ec064f15c9b2999e98e54997fe67c.tar.bz2 rails-7217d64f615ec064f15c9b2999e98e54997fe67c.zip | |
Use AbstractController error constants
Diffstat (limited to 'actionpack/lib')
| -rw-r--r-- | actionpack/lib/action_dispatch/middleware/show_exceptions.rb | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/actionpack/lib/action_dispatch/middleware/show_exceptions.rb b/actionpack/lib/action_dispatch/middleware/show_exceptions.rb index 471d18491c..bd87764f5b 100644 --- a/actionpack/lib/action_dispatch/middleware/show_exceptions.rb +++ b/actionpack/lib/action_dispatch/middleware/show_exceptions.rb @@ -10,8 +10,7 @@ module ActionDispatch @@rescue_responses = Hash.new(:internal_server_error) @@rescue_responses.update({ 'ActionController::RoutingError' => :not_found, - # TODO: Clean this up after the switch - ActionController::UnknownAction.name => :not_found, + 'AbstractController::ActionNotFound' => :not_found, 'ActiveRecord::RecordNotFound' => :not_found, 'ActiveRecord::StaleObjectError' => :conflict, 'ActiveRecord::RecordInvalid' => :unprocessable_entity, @@ -26,7 +25,7 @@ module ActionDispatch @@rescue_templates.update({ 'ActionView::MissingTemplate' => 'missing_template', 'ActionController::RoutingError' => 'routing_error', - ActionController::UnknownAction.name => 'unknown_action', + 'AbstractController::ActionNotFound' => 'unknown_action', 'ActionView::Template::Error' => 'template_error' }) |