diff options
| author | wycats <wycats@gmail.com> | 2010-06-07 23:03:59 -0400 |
|---|---|---|
| committer | wycats <wycats@gmail.com> | 2010-06-07 23:03:59 -0400 |
| commit | b97a3f33a36f936531e608343797b99268f8bd92 (patch) | |
| tree | 94abb825948b826fefdfd8952c25a9f3f3690772 /activesupport/test/abstract_unit.rb | |
| parent | 0042f4166f783085eb909d69d542b5323d8af5d6 (diff) | |
| parent | acef8feafa8a44271eb28685e180f8c28b7e4a0f (diff) | |
| download | rails-b97a3f33a36f936531e608343797b99268f8bd92.tar.gz rails-b97a3f33a36f936531e608343797b99268f8bd92.tar.bz2 rails-b97a3f33a36f936531e608343797b99268f8bd92.zip | |
Merge remote branch 'rsim/oracle_enhanced_rails3'
Diffstat (limited to 'activesupport/test/abstract_unit.rb')
| -rw-r--r-- | activesupport/test/abstract_unit.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activesupport/test/abstract_unit.rb b/activesupport/test/abstract_unit.rb index ea6ebca3ce..dd84860a91 100644 --- a/activesupport/test/abstract_unit.rb +++ b/activesupport/test/abstract_unit.rb @@ -18,7 +18,7 @@ ENV['NO_RELOAD'] = '1' require 'active_support' # Include shims until we get off 1.8.6 -require 'active_support/ruby/shim' +require 'active_support/ruby/shim' if RUBY_VERSION < '1.8.7' def uses_memcached(test_name) require 'memcache' |