diff options
| author | Xavier Noria <fxn@hashref.com> | 2010-04-05 12:15:08 -0700 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2010-04-05 12:15:08 -0700 |
| commit | 89978f10afbad3f856e2959a811bed1982715408 (patch) | |
| tree | 9913b04ec5a63e4e88dd70de023dc50029c43690 /activerecord | |
| parent | c140aca361506a3a759fbe03fad8adc748c807bb (diff) | |
| download | rails-89978f10afbad3f856e2959a811bed1982715408.tar.gz rails-89978f10afbad3f856e2959a811bed1982715408.tar.bz2 rails-89978f10afbad3f856e2959a811bed1982715408.zip | |
moves Object#singleton_class to Kernel#singleton_class to match Ruby also there, same for #class_eval to simplify, and adds coverage for class_eval
Diffstat (limited to 'activerecord')
| -rwxr-xr-x | activerecord/lib/active_record/base.rb | 2 | ||||
| -rw-r--r-- | activerecord/lib/active_record/migration.rb | 2 | ||||
| -rw-r--r-- | activerecord/lib/active_record/named_scope.rb | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/activerecord/lib/active_record/base.rb b/activerecord/lib/active_record/base.rb index 5f741c6ae7..f0b107255c 100755 --- a/activerecord/lib/active_record/base.rb +++ b/activerecord/lib/active_record/base.rb @@ -11,7 +11,7 @@ require 'active_support/core_ext/hash/deep_merge' 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/object/singleton_class' +require 'active_support/core_ext/kernel/singleton_class' require 'active_support/core_ext/module/delegation' require 'active_support/core_ext/object/duplicable' require 'active_support/core_ext/object/blank' diff --git a/activerecord/lib/active_record/migration.rb b/activerecord/lib/active_record/migration.rb index d4cda927ad..c163fb982a 100644 --- a/activerecord/lib/active_record/migration.rb +++ b/activerecord/lib/active_record/migration.rb @@ -1,4 +1,4 @@ -require 'active_support/core_ext/object/singleton_class' +require 'active_support/core_ext/kernel/singleton_class' module ActiveRecord # Exception that can be raised to stop migrations from going backwards. diff --git a/activerecord/lib/active_record/named_scope.rb b/activerecord/lib/active_record/named_scope.rb index 632322b517..aeed52e72a 100644 --- a/activerecord/lib/active_record/named_scope.rb +++ b/activerecord/lib/active_record/named_scope.rb @@ -1,6 +1,6 @@ require 'active_support/core_ext/array' require 'active_support/core_ext/hash/except' -require 'active_support/core_ext/object/singleton_class' +require 'active_support/core_ext/kernel/singleton_class' require 'active_support/core_ext/object/blank' module ActiveRecord |