diff options
| author | Nihad Abbasov <narkoz.2008@gmail.com> | 2012-10-02 13:37:25 +0500 |
|---|---|---|
| committer | Nihad Abbasov <narkoz.2008@gmail.com> | 2012-10-02 13:37:25 +0500 |
| commit | ae9b3d7cecd77b9ace38671b183e1a360bf632b6 (patch) | |
| tree | 144104beda9dc6c536d398ab81aa98b8fe9b2db5 /activesupport/lib | |
| parent | 0d41d6956f3dda7e8eb133b623bcfd6ad1eb41a1 (diff) | |
| download | rails-ae9b3d7cecd77b9ace38671b183e1a360bf632b6.tar.gz rails-ae9b3d7cecd77b9ace38671b183e1a360bf632b6.tar.bz2 rails-ae9b3d7cecd77b9ace38671b183e1a360bf632b6.zip | |
remove unnecessary object/conversions file
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, 2 insertions, 9 deletions
diff --git a/activesupport/lib/active_support/core_ext/object.rb b/activesupport/lib/active_support/core_ext/object.rb index ec2157221f..ab01d7787a 100644 --- a/activesupport/lib/active_support/core_ext/object.rb +++ b/activesupport/lib/active_support/core_ext/object.rb @@ -1,14 +1,11 @@ require 'active_support/core_ext/object/acts_like' require 'active_support/core_ext/object/blank' -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/duplicable' 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 deleted file mode 100644 index 540f7aadb0..0000000000 --- a/activesupport/lib/active_support/core_ext/object/conversions.rb +++ /dev/null @@ -1,4 +0,0 @@ -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' |