diff options
author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-06-11 14:56:27 -0300 |
---|---|---|
committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-06-11 14:56:27 -0300 |
commit | 0a77b467b40d34d3cf70fa8ddc515fc33f51f43b (patch) | |
tree | bf7b57b51a968be14ce02afe983ea270727af26a /activesupport/lib | |
parent | e0063270c2ca576ee6ea77889dab7bfb7110b612 (diff) | |
parent | ccdd97662e1fb00c23c90d59f65c091904959561 (diff) | |
download | rails-0a77b467b40d34d3cf70fa8ddc515fc33f51f43b.tar.gz rails-0a77b467b40d34d3cf70fa8ddc515fc33f51f43b.tar.bz2 rails-0a77b467b40d34d3cf70fa8ddc515fc33f51f43b.zip |
Merge pull request #15644 from akshay-vishnoi/activesupport
No need to require to_param, it is already required in object/to_query.rb
Diffstat (limited to 'activesupport/lib')
-rw-r--r-- | activesupport/lib/active_support/core_ext/object/conversions.rb | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/core_ext/object/conversions.rb b/activesupport/lib/active_support/core_ext/object/conversions.rb index 540f7aadb0..3cd3c88a28 100644 --- a/activesupport/lib/active_support/core_ext/object/conversions.rb +++ b/activesupport/lib/active_support/core_ext/object/conversions.rb @@ -1,4 +1,3 @@ -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' |