Permalink
Browse files

Merge branch 'master' of github.com:lifo/docrails

  • Loading branch information...
2 parents 19de3d8 + a42bc4c commit 39e872b42bf58828e0757c247ace0c6048491614 @alvaropereyra alvaropereyra committed May 28, 2012
View
1 activesupport/lib/active_support/core_ext/array/conversions.rb
@@ -106,7 +106,6 @@ def to_sentence(options = {})
# id list:
#
# Blog.all.to_formatted_s(:db) # => "1,2,3"
-
def to_formatted_s(format = :default)
case format
when :db
View
1 activesupport/lib/active_support/core_ext/big_decimal/conversions.rb
@@ -4,7 +4,6 @@
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)

0 comments on commit 39e872b

Please sign in to comment.