aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorJamis Buck <jamis@37signals.com>2005-10-19 15:56:21 +0000
committerJamis Buck <jamis@37signals.com>2005-10-19 15:56:21 +0000
commit4da2d6c1edee8b31896a206a3ed18e7af605501d (patch)
tree5b2c06c01c87942f1c2edceb496aea289a3a02b0 /actionpack
parent2555b885edc24f03d0d3006398f86a23d3d93800 (diff)
downloadrails-4da2d6c1edee8b31896a206a3ed18e7af605501d.tar.gz
rails-4da2d6c1edee8b31896a206a3ed18e7af605501d.tar.bz2
rails-4da2d6c1edee8b31896a206a3ed18e7af605501d.zip
Abbreviate RAILS_ROOT in traces
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2688 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/CHANGELOG5
-rw-r--r--actionpack/lib/action_controller/templates/rescues/_trace.rhtml5
2 files changed, 10 insertions, 0 deletions
diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG
index 83a7187e40..c7cac84206 100644
--- a/actionpack/CHANGELOG
+++ b/actionpack/CHANGELOG
@@ -1,3 +1,8 @@
+*SVN*
+
+* Abbreviate RAILS_ROOT in traces
+
+
*1.10.1* (October 19th, 2005)
* Update error trace templates [Nicholas Seckar]
diff --git a/actionpack/lib/action_controller/templates/rescues/_trace.rhtml b/actionpack/lib/action_controller/templates/rescues/_trace.rhtml
index 8175fbf18e..c773230f09 100644
--- a/actionpack/lib/action_controller/templates/rescues/_trace.rhtml
+++ b/actionpack/lib/action_controller/templates/rescues/_trace.rhtml
@@ -4,9 +4,14 @@
["Framework Trace", @exception.framework_backtrace],
["Full Trace", @exception.clean_backtrace]
]
+ if defined?(RAILS_ROOT)
+ traces.each { |name, trace| trace.map! { |p| p.gsub(/^#{RAILS_ROOT}/, '<b>#{RAILS_ROOT}</b>') } }
+ end
names = traces.collect {|name, trace| name}
%>
+<p><code>RAILS_ROOT: <%= RAILS_ROOT %></code></p>
+
<div id="traces">
<% names.each do |name| -%>
<%