aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2010-03-17 10:11:38 -0700
committerJeremy Kemper <jeremy@bitsweat.net>2010-03-17 10:11:38 -0700
commit067b350301279f608a369a39aff9b6f5a22357aa (patch)
treed69cead2a27b83fbecbab1fc090b9b9edad3a3a3
parent843255a763c5e68beaa3a1b0bca306c625c30797 (diff)
downloadrails-067b350301279f608a369a39aff9b6f5a22357aa.tar.gz
rails-067b350301279f608a369a39aff9b6f5a22357aa.tar.bz2
rails-067b350301279f608a369a39aff9b6f5a22357aa.zip
Move require closer to home
-rwxr-xr-xactiverecord/lib/active_record/base.rb1
-rw-r--r--activesupport/lib/active_support/core_ext/class/delegating_attributes.rb1
2 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/base.rb b/activerecord/lib/active_record/base.rb
index 6999d4113d..3d4172f368 100755
--- a/activerecord/lib/active_record/base.rb
+++ b/activerecord/lib/active_record/base.rb
@@ -13,7 +13,6 @@ require 'active_support/core_ext/hash/slice'
require 'active_support/core_ext/string/behavior'
require 'active_support/core_ext/object/singleton_class'
require 'active_support/core_ext/module/delegation'
-require 'active_support/core_ext/module/remove_method'
require 'arel'
require 'active_record/errors'
diff --git a/activesupport/lib/active_support/core_ext/class/delegating_attributes.rb b/activesupport/lib/active_support/core_ext/class/delegating_attributes.rb
index 9b2dc21d87..12caa76c98 100644
--- a/activesupport/lib/active_support/core_ext/class/delegating_attributes.rb
+++ b/activesupport/lib/active_support/core_ext/class/delegating_attributes.rb
@@ -1,6 +1,7 @@
require 'active_support/core_ext/object/blank'
require 'active_support/core_ext/array/extract_options'
require 'active_support/core_ext/object/singleton_class'
+require 'active_support/core_ext/module/remove_method'
class Class
def superclass_delegating_accessor(name, options = {})