diff options
Diffstat (limited to 'activerecord')
-rwxr-xr-x | activerecord/lib/active_record.rb | 11 | ||||
-rwxr-xr-x | activerecord/lib/active_record/base.rb | 3 | ||||
-rwxr-xr-x | activerecord/lib/active_record/fixtures.rb | 2 |
3 files changed, 4 insertions, 12 deletions
diff --git a/activerecord/lib/active_record.rb b/activerecord/lib/active_record.rb index ac49d114ab..94e835bdf1 100755 --- a/activerecord/lib/active_record.rb +++ b/activerecord/lib/active_record.rb @@ -23,16 +23,13 @@ $:.unshift(File.dirname(__FILE__)) +$:.unshift(File.dirname(__FILE__) + "/../../activesupport/lib") begin - require 'active_support' + require 'active_support' rescue LoadError - begin - require File.dirname(__FILE__) + '/../../activesupport/lib/active_support' - rescue LoadError - require 'rubygems' - require_gem 'activesupport' - end + require 'rubygems' + require_gem 'activesupport' end require 'active_record/base' diff --git a/activerecord/lib/active_record/base.rb b/activerecord/lib/active_record/base.rb index 92f5724249..1111296306 100755 --- a/activerecord/lib/active_record/base.rb +++ b/activerecord/lib/active_record/base.rb @@ -1,6 +1,3 @@ -require 'active_support/class_attribute_accessors' -require 'active_support/class_inheritable_attributes' -require 'active_support/inflector' require 'yaml' module ActiveRecord #:nodoc: diff --git a/activerecord/lib/active_record/fixtures.rb b/activerecord/lib/active_record/fixtures.rb index b03543a7c7..5ae4bfaf30 100755 --- a/activerecord/lib/active_record/fixtures.rb +++ b/activerecord/lib/active_record/fixtures.rb @@ -1,8 +1,6 @@ require 'erb' require 'yaml' require 'csv' -require 'active_support/class_inheritable_attributes' -require 'active_support/inflector' # Fixtures are a way of organizing data that you want to test against; in short, sample data. They come in 3 flavours: # |