Permalink
Browse files

No more toplevel arel sibling

  • Loading branch information...
1 parent 5ad0e31 commit df55781458f8d70a42f7584711a0dbdb84958e9b @jeremy jeremy committed Oct 15, 2009
Showing with 2 additions and 4 deletions.
  1. +2 −4 activerecord/lib/active_record.rb
@@ -25,17 +25,15 @@
$:.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
$:.unshift "#{File.dirname(__FILE__)}/../../activemodel/lib"
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!

0 comments on commit df55781

Please sign in to comment.