Merged updates from trunk into stable branch

[feedcatcher.git] / vendor / rails / actionpack / lib / action_controller / templates / rescues / diagnostics.erb

diff --git a/vendor/rails/actionpack/lib/action_controller/templates/rescues/diagnostics.erb b/vendor/rails/actionpack/lib/action_controller/templates/rescues/diagnostics.erb
new file mode 100644 (file)
index 0000000..669da1b
--- /dev/null
+++ b/vendor/rails/actionpack/lib/action_controller/templates/rescues/diagnostics.erb
@@ -0,0 +1,11 @@
+<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_path["rescues/_trace.erb"] %>
+
+<%= render :file => @rescues_path["rescues/_request_and_response.erb"] %>