diff options
| author | Jon Leighton <j@jonathanleighton.com> | 2011-03-12 08:44:03 +0000 |
|---|---|---|
| committer | Jon Leighton <j@jonathanleighton.com> | 2011-03-12 08:44:03 +0000 |
| commit | 17ea20426057aac43abcc0735534df31c577b918 (patch) | |
| tree | fd6daf7d564a9ac7ca4b45964a761e50e40ba5be /activesupport | |
| parent | 02a43f9f4585d3c932e12b60ef23543f9c534a2e (diff) | |
| parent | acd4bfb53764cfea0feaa367cfc8d00dbf9a87c3 (diff) | |
| download | rails-17ea20426057aac43abcc0735534df31c577b918.tar.gz rails-17ea20426057aac43abcc0735534df31c577b918.tar.bz2 rails-17ea20426057aac43abcc0735534df31c577b918.zip | |
Merge branch 'master' into nested_has_many_through
Diffstat (limited to 'activesupport')
| -rw-r--r-- | activesupport/lib/active_support/buffered_logger.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/activesupport/lib/active_support/buffered_logger.rb b/activesupport/lib/active_support/buffered_logger.rb index b861a6f62a..e41731f3e7 100644 --- a/activesupport/lib/active_support/buffered_logger.rb +++ b/activesupport/lib/active_support/buffered_logger.rb @@ -1,3 +1,4 @@ +require 'thread' require 'active_support/core_ext/class/attribute_accessors' module ActiveSupport |