aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2007-06-01 05:18:21 +0000
committerJeremy Kemper <jeremy@bitsweat.net>2007-06-01 05:18:21 +0000
commit83ce4c59be3d5f1f1246b46f53370f5f65fd0dc5 (patch)
tree33a9296e534cadd1cb237eb1ae8d7b48e7200f1a /actionpack
parent8ce54793074ebd03bd2bf301c1f9ab7b180f054a (diff)
downloadrails-83ce4c59be3d5f1f1246b46f53370f5f65fd0dc5.tar.gz
rails-83ce4c59be3d5f1f1246b46f53370f5f65fd0dc5.tar.bz2
rails-83ce4c59be3d5f1f1246b46f53370f5f65fd0dc5.zip
Remove RAILS_ROOT from backtrace paths. Closes #8540.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6923 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/CHANGELOG2
-rw-r--r--actionpack/lib/action_view/template_error.rb2
2 files changed, 3 insertions, 1 deletions
diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG
index aea3f9e794..d9c9651893 100644
--- a/actionpack/CHANGELOG
+++ b/actionpack/CHANGELOG
@@ -1,5 +1,7 @@
*SVN*
+* Remove RAILS_ROOT from backtrace paths. #8540 [Tim Pope]
+
* Routing: map.resource :logo routes to LogosController so the controller may be reused for multiple nestings or namespaces. [Jeremy Kemper]
* render :partial recognizes Active Record associations as Arrays. #8538 [kamal]
diff --git a/actionpack/lib/action_view/template_error.rb b/actionpack/lib/action_view/template_error.rb
index 34ed50ae9a..f82cb31846 100644
--- a/actionpack/lib/action_view/template_error.rb
+++ b/actionpack/lib/action_view/template_error.rb
@@ -98,5 +98,5 @@ end
if defined?(Exception::TraceSubstitutions)
Exception::TraceSubstitutions << [/:in\s+`_run_(html|xml).*'\s*$/, '']
- Exception::TraceSubstitutions << [%r{^\s*#{Regexp.escape RAILS_ROOT}}, '#{RAILS_ROOT}'] if defined?(RAILS_ROOT)
+ Exception::TraceSubstitutions << [%r{^\s*#{Regexp.escape RAILS_ROOT}/}, ''] if defined?(RAILS_ROOT)
end