diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2009-10-14 19:05:06 -0700 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2009-10-14 19:05:06 -0700 |
| commit | df55781458f8d70a42f7584711a0dbdb84958e9b (patch) | |
| tree | da751cc0d6a481264e69d6bb267f87e37afc9c6d | |
| parent | 5ad0e315e41d73aa5dcd8973f38dd99a5384e5ac (diff) | |
| download | rails-df55781458f8d70a42f7584711a0dbdb84958e9b.tar.gz rails-df55781458f8d70a42f7584711a0dbdb84958e9b.tar.bz2 rails-df55781458f8d70a42f7584711a0dbdb84958e9b.zip | |
No more toplevel arel sibling
| -rw-r--r-- | activerecord/lib/active_record.rb | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/activerecord/lib/active_record.rb b/activerecord/lib/active_record.rb index d9310a9927..f4303f3f04 100644 --- a/activerecord/lib/active_record.rb +++ b/activerecord/lib/active_record.rb @@ -25,10 +25,6 @@ activesupport_path = "#{File.dirname(__FILE__)}/../../activesupport/lib" $:.unshift(activesupport_path) if File.directory?(activesupport_path) require 'active_support' -arel_path = "#{File.dirname(__FILE__)}/../../arel/lib" -$:.unshift(arel_path) if File.directory?(arel_path) -require 'arel' - begin require 'active_model' rescue LoadError @@ -36,6 +32,8 @@ rescue LoadError require 'active_model' end +require 'arel' + module ActiveRecord # TODO: Review explicit loads to see if they will automatically be handled by the initializer. def self.load_all! |