From 4aee8dd486828943fb414504500efdbcfb49f884 Mon Sep 17 00:00:00 2001
From: Xavier Noria <fxn@hashref.com>
Date: Thu, 2 Aug 2012 21:25:54 +0200
Subject: load active_support/core_ext/module/delegation in
 active_support/rails

---
 activerecord/lib/active_record/associations.rb        | 1 -
 activerecord/lib/active_record/base.rb                | 1 -
 activerecord/lib/active_record/connection_handling.rb | 1 -
 activerecord/lib/active_record/core.rb                | 1 -
 activerecord/lib/active_record/migration.rb           | 1 -
 activerecord/lib/active_record/model.rb               | 1 -
 activerecord/lib/active_record/querying.rb            | 1 -
 activerecord/lib/active_record/relation/delegation.rb | 1 -
 8 files changed, 8 deletions(-)

(limited to 'activerecord/lib')

diff --git a/activerecord/lib/active_record/associations.rb b/activerecord/lib/active_record/associations.rb
index e47ad286f8..17df34ed8a 100644
--- a/activerecord/lib/active_record/associations.rb
+++ b/activerecord/lib/active_record/associations.rb
@@ -1,5 +1,4 @@
 require 'active_support/core_ext/enumerable'
-require 'active_support/core_ext/module/delegation'
 require 'active_support/core_ext/string/conversions'
 require 'active_support/core_ext/module/remove_method'
 
diff --git a/activerecord/lib/active_record/base.rb b/activerecord/lib/active_record/base.rb
index ddf6c9e3f3..ca8cc89ae9 100644
--- a/activerecord/lib/active_record/base.rb
+++ b/activerecord/lib/active_record/base.rb
@@ -12,7 +12,6 @@ require 'active_support/core_ext/hash/indifferent_access'
 require 'active_support/core_ext/hash/slice'
 require 'active_support/core_ext/string/behavior'
 require 'active_support/core_ext/kernel/singleton_class'
-require 'active_support/core_ext/module/delegation'
 require 'active_support/core_ext/module/introspection'
 require 'active_support/core_ext/object/duplicable'
 require 'active_support/deprecation'
diff --git a/activerecord/lib/active_record/connection_handling.rb b/activerecord/lib/active_record/connection_handling.rb
index bda41df80f..7863c795ed 100644
--- a/activerecord/lib/active_record/connection_handling.rb
+++ b/activerecord/lib/active_record/connection_handling.rb
@@ -1,4 +1,3 @@
-require 'active_support/core_ext/module/delegation'
 
 module ActiveRecord
   module ConnectionHandling
diff --git a/activerecord/lib/active_record/core.rb b/activerecord/lib/active_record/core.rb
index 7eac6c7e90..1145d2138c 100644
--- a/activerecord/lib/active_record/core.rb
+++ b/activerecord/lib/active_record/core.rb
@@ -1,6 +1,5 @@
 require 'active_support/core_ext/hash/indifferent_access'
 require 'active_support/core_ext/object/deep_dup'
-require 'active_support/core_ext/module/delegation'
 require 'thread'
 
 module ActiveRecord
diff --git a/activerecord/lib/active_record/migration.rb b/activerecord/lib/active_record/migration.rb
index d58176bc62..c12fe69166 100644
--- a/activerecord/lib/active_record/migration.rb
+++ b/activerecord/lib/active_record/migration.rb
@@ -1,4 +1,3 @@
-require "active_support/core_ext/module/delegation"
 require "active_support/core_ext/class/attribute_accessors"
 require 'active_support/deprecation'
 require 'set'
diff --git a/activerecord/lib/active_record/model.rb b/activerecord/lib/active_record/model.rb
index d911e7d876..6d358b1dc0 100644
--- a/activerecord/lib/active_record/model.rb
+++ b/activerecord/lib/active_record/model.rb
@@ -1,5 +1,4 @@
 require 'active_support/deprecation'
-require 'active_support/core_ext/module/delegation'
 require 'active_support/core_ext/module/attribute_accessors'
 
 module ActiveRecord
diff --git a/activerecord/lib/active_record/querying.rb b/activerecord/lib/active_record/querying.rb
index b8b54efe9f..484543f47c 100644
--- a/activerecord/lib/active_record/querying.rb
+++ b/activerecord/lib/active_record/querying.rb
@@ -1,4 +1,3 @@
-require 'active_support/core_ext/module/delegation'
 require 'active_support/deprecation'
 
 module ActiveRecord
diff --git a/activerecord/lib/active_record/relation/delegation.rb b/activerecord/lib/active_record/relation/delegation.rb
index a1c7e5b549..ab8b36c8ab 100644
--- a/activerecord/lib/active_record/relation/delegation.rb
+++ b/activerecord/lib/active_record/relation/delegation.rb
@@ -1,4 +1,3 @@
-require 'active_support/core_ext/module/delegation'
 
 module ActiveRecord
   module Delegation # :nodoc:
-- 
cgit v1.2.3