Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge pull request #7817 from NARKOZ/object-conversions

remove unnecessary object/conversions file
  • Loading branch information...
commit 2296e74973611c46d0c3a95ec8ef916bb28a31f5 2 parents 8815de7 + ae9b3d7
@fxn fxn authored
View
7 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'
View
4 activesupport/lib/active_support/core_ext/object/conversions.rb
@@ -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'
View
1  activesupport/test/core_ext/array_ext_test.rb
@@ -1,7 +1,6 @@
require 'abstract_unit'
require 'active_support/core_ext/array'
require 'active_support/core_ext/big_decimal'
-require 'active_support/core_ext/object/conversions'
require 'active_support/core_ext' # FIXME: pulling in all to_xml extensions
require 'active_support/hash_with_indifferent_access'
View
1  activesupport/test/core_ext/hash_ext_test.rb
@@ -3,7 +3,6 @@
require 'bigdecimal'
require 'active_support/core_ext/string/access'
require 'active_support/ordered_hash'
-require 'active_support/core_ext/object/conversions'
require 'active_support/core_ext/object/deep_dup'
require 'active_support/inflections'
Please sign in to comment.
Something went wrong with that request. Please try again.