diff options
| author | Hongli Lai (Phusion) <hongli@phusion.nl> | 2008-12-09 01:38:17 +0100 |
|---|---|---|
| committer | Hongli Lai (Phusion) <hongli@phusion.nl> | 2008-12-09 01:38:17 +0100 |
| commit | 13c6c3cfc59ff0b400b294dce15f32752b0fb5f5 (patch) | |
| tree | 052ac9c8f4adb91a4b32e3b2a97b1bc6bdace2e6 /railties/lib/rails | |
| parent | ccb96f2297e8783165cba764e9b5d51e1a15ff87 (diff) | |
| parent | 4e60eebae05aeec65e4894e3901c9d61c9b32910 (diff) | |
| download | rails-13c6c3cfc59ff0b400b294dce15f32752b0fb5f5.tar.gz rails-13c6c3cfc59ff0b400b294dce15f32752b0fb5f5.tar.bz2 rails-13c6c3cfc59ff0b400b294dce15f32752b0fb5f5.zip | |
Merge commit 'origin/master' into savepoints
Diffstat (limited to 'railties/lib/rails')
| -rw-r--r-- | railties/lib/rails/backtrace_cleaner.rb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/railties/lib/rails/backtrace_cleaner.rb b/railties/lib/rails/backtrace_cleaner.rb index d8626aaf14..f344c6477d 100644 --- a/railties/lib/rails/backtrace_cleaner.rb +++ b/railties/lib/rails/backtrace_cleaner.rb @@ -3,7 +3,9 @@ module Rails ERB_METHOD_SIG = /:in `_run_erb_.*/ VENDOR_DIRS = %w( vendor/plugins vendor/gems vendor/rails ) - SERVER_DIRS = %w( lib/mongrel bin/mongrel lib/rack ) + SERVER_DIRS = %w( lib/mongrel bin/mongrel + lib/passenger bin/passenger-spawn-server + lib/rack ) RAILS_NOISE = %w( script/server ) RUBY_NOISE = %w( rubygems/custom_require benchmark.rb ) @@ -30,4 +32,4 @@ module Rails Rails.backtrace_cleaner.clean(backtrace) end end -end
\ No newline at end of file +end |