diff options
| author | Colin Law <colin@clanlaw.org.uk> | 2009-01-11 12:13:50 +0000 |
|---|---|---|
| committer | Colin Law <colin@clanlaw.org.uk> | 2009-01-11 12:13:50 +0000 |
| commit | 55901d7d86f5608c4a07386ca6378121eb8127cb (patch) | |
| tree | 8ede6a21529dfac8c818a3fe1584fb46f00c03ff /railties/lib/rails | |
| parent | 3e60ea6c231810e2b850492a86874b4800dfbf27 (diff) | |
| parent | cf4b24407ada79c133fbae1ec7db692882225956 (diff) | |
| download | rails-55901d7d86f5608c4a07386ca6378121eb8127cb.tar.gz rails-55901d7d86f5608c4a07386ca6378121eb8127cb.tar.bz2 rails-55901d7d86f5608c4a07386ca6378121eb8127cb.zip | |
Merge branch 'master' of git@github.com:lifo/docrails
Diffstat (limited to 'railties/lib/rails')
| -rw-r--r-- | railties/lib/rails/backtrace_cleaner.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/railties/lib/rails/backtrace_cleaner.rb b/railties/lib/rails/backtrace_cleaner.rb index 94d34cda39..e1b422716d 100644 --- a/railties/lib/rails/backtrace_cleaner.rb +++ b/railties/lib/rails/backtrace_cleaner.rb @@ -2,7 +2,7 @@ module Rails class BacktraceCleaner < ActiveSupport::BacktraceCleaner ERB_METHOD_SIG = /:in `_run_erb_.*/ - VENDOR_DIRS = %w( vendor/plugins vendor/gems vendor/rails ) + VENDOR_DIRS = %w( vendor/gems vendor/rails ) SERVER_DIRS = %w( lib/mongrel bin/mongrel lib/passenger bin/passenger-spawn-server lib/rack ) @@ -15,11 +15,12 @@ module Rails def initialize super - add_filter { |line| line.sub(RAILS_ROOT, '') } + add_filter { |line| line.sub("#{RAILS_ROOT}/", '') } add_filter { |line| line.sub(ERB_METHOD_SIG, '') } add_filter { |line| line.sub('./', '/') } # for tests add_filter { |line| line.sub(/(#{GEMS_DIR})\/gems\/([a-z]+)-([0-9.]+)\/(.*)/, '\2 (\3) \4')} # http://gist.github.com/30430 add_silencer { |line| ALL_NOISE.any? { |dir| line.include?(dir) } } + add_silencer { |line| line =~ %r(vendor/plugins/[^\/]+/lib) } end end |