aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_dispatch/middleware/show_exceptions.rb
diff options
context:
space:
mode:
authorXavier Noria <fxn@hashref.com>2011-04-23 01:16:21 +0200
committerXavier Noria <fxn@hashref.com>2011-04-23 01:16:21 +0200
commit384dbfd1408721ded071a587b0dc9ee40203607e (patch)
tree770854b984691dea8187ca0a998a28e93a008093 /actionpack/lib/action_dispatch/middleware/show_exceptions.rb
parent900470cf3cd346ad1b17cf6902f3f98e6dae7709 (diff)
parentaf1b48926f49226c934995c322ee017239158cf3 (diff)
downloadrails-384dbfd1408721ded071a587b0dc9ee40203607e.tar.gz
rails-384dbfd1408721ded071a587b0dc9ee40203607e.tar.bz2
rails-384dbfd1408721ded071a587b0dc9ee40203607e.zip
Merge branch 'master' of git://github.com/rails/rails
Diffstat (limited to 'actionpack/lib/action_dispatch/middleware/show_exceptions.rb')
-rw-r--r--actionpack/lib/action_dispatch/middleware/show_exceptions.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_dispatch/middleware/show_exceptions.rb b/actionpack/lib/action_dispatch/middleware/show_exceptions.rb
index dbe3206808..b1adf3d2d1 100644
--- a/actionpack/lib/action_dispatch/middleware/show_exceptions.rb
+++ b/actionpack/lib/action_dispatch/middleware/show_exceptions.rb
@@ -50,7 +50,7 @@ module ActionDispatch
# Only this middleware cares about RoutingError. So, let's just raise
# it here.
if headers['X-Cascade'] == 'pass'
- raise ActionController::RoutingError, "No route matches #{env['PATH_INFO'].inspect}"
+ raise ActionController::RoutingError, "No route matches [#{env['REQUEST_METHOD']}] #{env['PATH_INFO'].inspect}"
end
rescue Exception => exception
raise exception if env['action_dispatch.show_exceptions'] == false