diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-06-11 16:43:49 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-06-11 16:43:49 -0300 |
| commit | 168dc1968c13928ce355b77ff0a0bebccfffb55b (patch) | |
| tree | e550cd8035907b574dfcf132b0763fcff11f37f7 | |
| parent | e7580db1f34eeaf853ac7efa993eeb0902b692b4 (diff) | |
| parent | d697ee14264a90a39cdbe87857656d8b314ac9b7 (diff) | |
| download | rails-168dc1968c13928ce355b77ff0a0bebccfffb55b.tar.gz rails-168dc1968c13928ce355b77ff0a0bebccfffb55b.tar.bz2 rails-168dc1968c13928ce355b77ff0a0bebccfffb55b.zip | |
Merge pull request #15650 from kuldeepaggarwal/remove-unecessary-require
remove unnecssary require of `to_param`, as `to_query` is already require `to_param`
3 files changed, 0 insertions, 3 deletions
diff --git a/activesupport/lib/active_support/core_ext/array/conversions.rb b/activesupport/lib/active_support/core_ext/array/conversions.rb index 76ffd23ed1..6b632022c2 100644 --- a/activesupport/lib/active_support/core_ext/array/conversions.rb +++ b/activesupport/lib/active_support/core_ext/array/conversions.rb @@ -1,7 +1,6 @@ require 'active_support/xml_mini' require 'active_support/core_ext/hash/keys' require 'active_support/core_ext/string/inflections' -require 'active_support/core_ext/object/to_param' require 'active_support/core_ext/object/to_query' class Array diff --git a/activesupport/lib/active_support/core_ext/hash/conversions.rb b/activesupport/lib/active_support/core_ext/hash/conversions.rb index 2149d4439d..5e86d9443e 100644 --- a/activesupport/lib/active_support/core_ext/hash/conversions.rb +++ b/activesupport/lib/active_support/core_ext/hash/conversions.rb @@ -1,7 +1,6 @@ require 'active_support/xml_mini' require 'active_support/time' require 'active_support/core_ext/object/blank' -require 'active_support/core_ext/object/to_param' require 'active_support/core_ext/object/to_query' require 'active_support/core_ext/array/wrap' require 'active_support/core_ext/hash/reverse_merge' diff --git a/activesupport/lib/active_support/core_ext/object.rb b/activesupport/lib/active_support/core_ext/object.rb index f4f9152d6a..12d17a42c2 100644 --- a/activesupport/lib/active_support/core_ext/object.rb +++ b/activesupport/lib/active_support/core_ext/object.rb @@ -9,6 +9,5 @@ require 'active_support/core_ext/object/conversions' require 'active_support/core_ext/object/instance_variables' require 'active_support/core_ext/object/json' -require 'active_support/core_ext/object/to_param' require 'active_support/core_ext/object/to_query' require 'active_support/core_ext/object/with_options' |