diff options
| author | Alvaro Pereyra <alvaro@xendacentral.com> | 2012-05-28 02:52:21 -0500 |
|---|---|---|
| committer | Alvaro Pereyra <alvaro@xendacentral.com> | 2012-05-28 02:52:21 -0500 |
| commit | 39e872b42bf58828e0757c247ace0c6048491614 (patch) | |
| tree | 9fdb9cd49b6b8e10e4960f222d5095761a543598 | |
| parent | 19de3d8d7fe623b8c9d67676f8113296ebdbb640 (diff) | |
| parent | a42bc4c9dfd7da50604d4136c9466dc7fcd3da14 (diff) | |
| download | rails-39e872b42bf58828e0757c247ace0c6048491614.tar.gz rails-39e872b42bf58828e0757c247ace0c6048491614.tar.bz2 rails-39e872b42bf58828e0757c247ace0c6048491614.zip | |
Merge branch 'master' of github.com:lifo/docrails
| -rw-r--r-- | activesupport/lib/active_support/core_ext/array/conversions.rb | 1 | ||||
| -rw-r--r-- | activesupport/lib/active_support/core_ext/big_decimal/conversions.rb | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/activesupport/lib/active_support/core_ext/array/conversions.rb b/activesupport/lib/active_support/core_ext/array/conversions.rb index 2af87d3b6b..d8b8585ada 100644 --- a/activesupport/lib/active_support/core_ext/array/conversions.rb +++ b/activesupport/lib/active_support/core_ext/array/conversions.rb @@ -106,7 +106,6 @@ class Array # id list: # # Blog.all.to_formatted_s(:db) # => "1,2,3" - def to_formatted_s(format = :default) case format when :db diff --git a/activesupport/lib/active_support/core_ext/big_decimal/conversions.rb b/activesupport/lib/active_support/core_ext/big_decimal/conversions.rb index 5b673e104a..3ec7e576c8 100644 --- a/activesupport/lib/active_support/core_ext/big_decimal/conversions.rb +++ b/activesupport/lib/active_support/core_ext/big_decimal/conversions.rb @@ -4,7 +4,6 @@ require 'yaml' class BigDecimal YAML_MAPPING = { 'Infinity' => '.Inf', '-Infinity' => '-.Inf', 'NaN' => '.NaN' } - def encode_with(coder) string = to_s coder.represent_scalar(nil, YAML_MAPPING[string] || string) |