kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

No more toplevel arel sibling

Browse source
This commit is contained in:
Jeremy Kemper 2009-10-14 19:05:06 -07:00
parent 5ad0e315e4
commit df55781458
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
activerecord/lib/active_record.rb
View file

@ -25,10 +25,6 @@ activesupport_path = "#{File.dirname(__FILE__)}/../../activesupport/lib"
$:.unshift(activesupport_path) if File.directory?(activesupport_path) $:.unshift(activesupport_path) if File.directory?(activesupport_path)
require 'active_support' require 'active_support'
arel_path = "#{File.dirname(__FILE__)}/../../arel/lib"
$:.unshift(arel_path) if File.directory?(arel_path)
require 'arel'
begin begin
require 'active_model' require 'active_model'
rescue LoadError rescue LoadError
@ -36,6 +32,8 @@ rescue LoadError
require 'active_model' require 'active_model'
end end
require 'arel'
module ActiveRecord module ActiveRecord
# TODO: Review explicit loads to see if they will automatically be handled by the initializer. # TODO: Review explicit loads to see if they will automatically be handled by the initializer.
def self.load_all! def self.load_all!