diff options
author | wycats <wycats@gmail.com> | 2010-04-13 14:07:46 -0700 |
---|---|---|
committer | wycats <wycats@gmail.com> | 2010-04-13 14:07:46 -0700 |
commit | 8e9df34fa3fd22719d939ba72f19b3ae9ffcc018 (patch) | |
tree | fb7d56ee45fcf33ac78f6591e1fcd8d8de3a54c4 /activesupport | |
parent | dc251389d1ab4303b80a22642f4241940b73cbe7 (diff) | |
parent | b4fd5e6f1a00b7c2b482de3d3b99a27adeba5920 (diff) | |
download | rails-8e9df34fa3fd22719d939ba72f19b3ae9ffcc018.tar.gz rails-8e9df34fa3fd22719d939ba72f19b3ae9ffcc018.tar.bz2 rails-8e9df34fa3fd22719d939ba72f19b3ae9ffcc018.zip |
Merge branch 'master' of github.com:rails/rails
Diffstat (limited to 'activesupport')
-rw-r--r-- | activesupport/CHANGELOG | 2 | ||||
-rw-r--r-- | activesupport/lib/active_support/core_ext/proc.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/activesupport/CHANGELOG b/activesupport/CHANGELOG index 749e59e091..da370303c6 100644 --- a/activesupport/CHANGELOG +++ b/activesupport/CHANGELOG @@ -1,4 +1,4 @@ -*Rails 3.0.0 [beta 3] (pending)* +*Rails 3.0.0 [beta 3] (April 13th, 2010)* * Improve transliteration quality. #4374 [Norman Clarke] 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) |