aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib/active_support/core_ext
diff options
context:
space:
mode:
authorwycats <wycats@gmail.com>2010-04-13 14:07:46 -0700
committerwycats <wycats@gmail.com>2010-04-13 14:07:46 -0700
commit8e9df34fa3fd22719d939ba72f19b3ae9ffcc018 (patch)
treefb7d56ee45fcf33ac78f6591e1fcd8d8de3a54c4 /activesupport/lib/active_support/core_ext
parentdc251389d1ab4303b80a22642f4241940b73cbe7 (diff)
parentb4fd5e6f1a00b7c2b482de3d3b99a27adeba5920 (diff)
downloadrails-8e9df34fa3fd22719d939ba72f19b3ae9ffcc018.tar.gz
rails-8e9df34fa3fd22719d939ba72f19b3ae9ffcc018.tar.bz2
rails-8e9df34fa3fd22719d939ba72f19b3ae9ffcc018.zip
Merge branch 'master' of github.com:rails/rails
Diffstat (limited to 'activesupport/lib/active_support/core_ext')
-rw-r--r--activesupport/lib/active_support/core_ext/proc.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/core_ext/proc.rb b/activesupport/lib/active_support/core_ext/proc.rb
index 71b413a88a..94bb5fb0cb 100644
--- a/activesupport/lib/active_support/core_ext/proc.rb
+++ b/activesupport/lib/active_support/core_ext/proc.rb
@@ -1,4 +1,4 @@
-require "active_support/core_ext/object"
+require "active_support/core_ext/kernel/singleton_class"
class Proc #:nodoc:
def bind(object)