diff options
| author | Xavier Noria <fxn@hashref.com> | 2012-10-16 12:05:00 +0200 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2012-10-16 12:05:00 +0200 |
| commit | 74bf8afb9fb92b4c45ffdd37b91e0580b86c1590 (patch) | |
| tree | cd1e97e5892422300e7b1cf9190fc308b10cb7a5 /activesupport/lib | |
| parent | d1fb675a104d5ee07ce786c7b99be9897a0ea766 (diff) | |
| download | rails-74bf8afb9fb92b4c45ffdd37b91e0580b86c1590.tar.gz rails-74bf8afb9fb92b4c45ffdd37b91e0580b86c1590.tar.bz2 rails-74bf8afb9fb92b4c45ffdd37b91e0580b86c1590.zip | |
Revert "remove unnecessary object/conversions file"
This file is used at least by Active Merchant, its existence
is maybe not necessary but no big deal either.
This reverts commit ae9b3d7cecd77b9ace38671b183e1a360bf632b6.
Diffstat (limited to 'activesupport/lib')
| -rw-r--r-- | activesupport/lib/active_support/core_ext/object.rb | 7 | ||||
| -rw-r--r-- | activesupport/lib/active_support/core_ext/object/conversions.rb | 4 |
2 files changed, 9 insertions, 2 deletions
diff --git a/activesupport/lib/active_support/core_ext/object.rb b/activesupport/lib/active_support/core_ext/object.rb index ab01d7787a..ec2157221f 100644 --- a/activesupport/lib/active_support/core_ext/object.rb +++ b/activesupport/lib/active_support/core_ext/object.rb @@ -1,11 +1,14 @@ require 'active_support/core_ext/object/acts_like' require 'active_support/core_ext/object/blank' -require 'active_support/core_ext/object/deep_dup' require 'active_support/core_ext/object/duplicable' +require 'active_support/core_ext/object/deep_dup' +require 'active_support/core_ext/object/try' require 'active_support/core_ext/object/inclusion' + +require 'active_support/core_ext/object/conversions' require 'active_support/core_ext/object/instance_variables' + require 'active_support/core_ext/object/to_json' require 'active_support/core_ext/object/to_param' require 'active_support/core_ext/object/to_query' -require 'active_support/core_ext/object/try' require 'active_support/core_ext/object/with_options' diff --git a/activesupport/lib/active_support/core_ext/object/conversions.rb b/activesupport/lib/active_support/core_ext/object/conversions.rb new file mode 100644 index 0000000000..540f7aadb0 --- /dev/null +++ b/activesupport/lib/active_support/core_ext/object/conversions.rb @@ -0,0 +1,4 @@ +require 'active_support/core_ext/object/to_param' +require 'active_support/core_ext/object/to_query' +require 'active_support/core_ext/array/conversions' +require 'active_support/core_ext/hash/conversions' |