aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_dispatch/middleware/templates
diff options
context:
space:
mode:
authorCarlos Antonio da Silva <carlosantoniodasilva@gmail.com>2013-01-05 05:41:13 -0800
committerCarlos Antonio da Silva <carlosantoniodasilva@gmail.com>2013-01-05 05:41:13 -0800
commita6cec6e8ed7cc158fa1bc3cc59a5c3fa392b2afe (patch)
tree8dc6b747221945e37a0ea1959a9c567271a16cdc /actionpack/lib/action_dispatch/middleware/templates
parent1e1c7afe3fed844e1a11a75e125a0ac7af1d468b (diff)
parent80795e02ca7025651ee7abc2e85e123e5e0a7ad6 (diff)
downloadrails-a6cec6e8ed7cc158fa1bc3cc59a5c3fa392b2afe.tar.gz
rails-a6cec6e8ed7cc158fa1bc3cc59a5c3fa392b2afe.tar.bz2
rails-a6cec6e8ed7cc158fa1bc3cc59a5c3fa392b2afe.zip
Merge pull request #8658 from senny/8649_unify_routes_output_for_console_and_web
Unify routes output for console and web, ensure engine routes are shown in html routes table. Closes #8649.
Diffstat (limited to 'actionpack/lib/action_dispatch/middleware/templates')
-rw-r--r--actionpack/lib/action_dispatch/middleware/templates/rescues/routing_error.erb4
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_dispatch/middleware/templates/rescues/routing_error.erb b/actionpack/lib/action_dispatch/middleware/templates/rescues/routing_error.erb
index 77804a8cbb..9463da520b 100644
--- a/actionpack/lib/action_dispatch/middleware/templates/rescues/routing_error.erb
+++ b/actionpack/lib/action_dispatch/middleware/templates/rescues/routing_error.erb
@@ -15,6 +15,7 @@
<% end %>
<%= render template: "rescues/_trace" %>
+<% if @routes_inspector %>
<h2>
Routes
</h2>
@@ -23,6 +24,5 @@
Routes match in priority from top to bottom
</p>
-<%= render layout: "routes/route_wrapper" do %>
- <%= render partial: "routes/route", collection: @routes %>
+ <%= @routes_inspector.format(ActionDispatch::DebugExceptions::TableRoutesFormatter.new(self)) %>
<% end %>