aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_dispatch/middleware/templates/rescues/diagnostics.erb
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2009-05-04 08:35:35 -0700
committerJeremy Kemper <jeremy@bitsweat.net>2009-05-04 08:35:35 -0700
commit8b6d2ef2f562c34ebc2ef547b0a18c31f5820569 (patch)
treeb1397a8374b465ea2f300e776de126bb88386bcc /actionpack/lib/action_dispatch/middleware/templates/rescues/diagnostics.erb
parentd3ee8756c8b09b8524a9599926b02ededd27319c (diff)
parentbcc4537f2a0d37fc02d67e9564fa5c9c5555b3d5 (diff)
downloadrails-8b6d2ef2f562c34ebc2ef547b0a18c31f5820569.tar.gz
rails-8b6d2ef2f562c34ebc2ef547b0a18c31f5820569.tar.bz2
rails-8b6d2ef2f562c34ebc2ef547b0a18c31f5820569.zip
Merge branch 'master' of git@github.com:rails/rails
Diffstat (limited to 'actionpack/lib/action_dispatch/middleware/templates/rescues/diagnostics.erb')
-rw-r--r--actionpack/lib/action_dispatch/middleware/templates/rescues/diagnostics.erb10
1 files changed, 10 insertions, 0 deletions
diff --git a/actionpack/lib/action_dispatch/middleware/templates/rescues/diagnostics.erb b/actionpack/lib/action_dispatch/middleware/templates/rescues/diagnostics.erb
new file mode 100644
index 0000000000..693e56270a
--- /dev/null
+++ b/actionpack/lib/action_dispatch/middleware/templates/rescues/diagnostics.erb
@@ -0,0 +1,10 @@
+<h1>
+ <%=h @exception.class.to_s %>
+ <% if @request.parameters['controller'] %>
+ in <%=h @request.parameters['controller'].humanize %>Controller<% if @request.parameters['action'] %>#<%=h @request.parameters['action'] %><% end %>
+ <% end %>
+</h1>
+<pre><%=h @exception.clean_message %></pre>
+
+<%= render :file => "rescues/_trace.erb" %>
+<%= render :file => "rescues/_request_and_response.erb" %>