aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib/active_support/core_ext/object.rb
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2007-09-27 10:13:50 +0000
committerJeremy Kemper <jeremy@bitsweat.net>2007-09-27 10:13:50 +0000
commit935f8215371d68f36950c709061e5876ecadaa89 (patch)
treec6f55c027d3febebeb9704b364e0d7bacb9b0710 /activesupport/lib/active_support/core_ext/object.rb
parentf3560d5a956f13df0571471c63f05369b85ba67d (diff)
downloadrails-935f8215371d68f36950c709061e5876ecadaa89.tar.gz
rails-935f8215371d68f36950c709061e5876ecadaa89.tar.bz2
rails-935f8215371d68f36950c709061e5876ecadaa89.zip
Object#copy_instance_variables_from Ruby 1.9 compat
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7654 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activesupport/lib/active_support/core_ext/object.rb')
-rw-r--r--activesupport/lib/active_support/core_ext/object.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/core_ext/object.rb b/activesupport/lib/active_support/core_ext/object.rb
index 3dd6deaba1..57238f38f5 100644
--- a/activesupport/lib/active_support/core_ext/object.rb
+++ b/activesupport/lib/active_support/core_ext/object.rb
@@ -1,2 +1,3 @@
require File.dirname(__FILE__) + '/object/extending'
-require File.dirname(__FILE__) + '/object/misc' \ No newline at end of file
+require File.dirname(__FILE__) + '/object/instance_variables'
+require File.dirname(__FILE__) + '/object/misc'