diff options
Diffstat (limited to 'activerecord/lib/active_record.rb')
-rwxr-xr-x | activerecord/lib/active_record.rb | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/activerecord/lib/active_record.rb b/activerecord/lib/active_record.rb index a1dde6bf5b..0eea2d02c1 100755 --- a/activerecord/lib/active_record.rb +++ b/activerecord/lib/active_record.rb @@ -24,10 +24,20 @@ $:.unshift(File.dirname(__FILE__)) -require 'active_record/support/core_ext' -require 'active_record/support/clean_logger' -require 'active_record/support/misc' -require 'active_record/support/dependencies' +begin + require 'active_support/core_ext' + require 'active_support/clean_logger' + require 'active_support/misc' + require 'active_support/dependencies' +rescue LoadError + require 'rubygems' + require_gem 'activesupport' + + require 'active_support/core_ext' + require 'active_support/clean_logger' + require 'active_support/misc' + require 'active_support/dependencies' +end require 'active_record/base' require 'active_record/observer' |