aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
diff options
context:
space:
mode:
Diffstat (limited to 'activerecord')
-rwxr-xr-xactiverecord/lib/active_record.rb10
1 files changed, 1 insertions, 9 deletions
diff --git a/activerecord/lib/active_record.rb b/activerecord/lib/active_record.rb
index 0eea2d02c1..0541413625 100755
--- a/activerecord/lib/active_record.rb
+++ b/activerecord/lib/active_record.rb
@@ -25,18 +25,10 @@
$:.unshift(File.dirname(__FILE__))
begin
- require 'active_support/core_ext'
- require 'active_support/clean_logger'
- require 'active_support/misc'
- require 'active_support/dependencies'
+ require 'active_support'
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'