aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport
diff options
context:
space:
mode:
authorErich Menge <erich.menge@me.com>2012-05-30 12:48:57 -0500
committerErich Menge <erich.menge@me.com>2012-05-30 12:48:57 -0500
commitda0ef60d3b9dd226d24465741eca47bde97745e5 (patch)
tree6915b21df61facb1c3c3aa423de717f080fc4aab /activesupport
parentec74763c393c6a5f54eb64f0313610aead7f815a (diff)
downloadrails-da0ef60d3b9dd226d24465741eca47bde97745e5.tar.gz
rails-da0ef60d3b9dd226d24465741eca47bde97745e5.tar.bz2
rails-da0ef60d3b9dd226d24465741eca47bde97745e5.zip
Fix typo [ci skip]
Diffstat (limited to 'activesupport')
-rw-r--r--activesupport/lib/active_support/json/encoding.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/json/encoding.rb b/activesupport/lib/active_support/json/encoding.rb
index ded02c873a..59709a19f1 100644
--- a/activesupport/lib/active_support/json/encoding.rb
+++ b/activesupport/lib/active_support/json/encoding.rb
@@ -192,7 +192,7 @@ end
class Float
# Encoding Infinity or NaN to JSON should return "null". The default returns
- # "Infinity" or "NaN" breaks parsing the JSON. E.g. JSON.parse('[NaN]').
+ # "Infinity" or "NaN" which breaks parsing the JSON. E.g. JSON.parse('[NaN]').
def as_json(options = nil) finite? ? self : nil end #:nodoc:
end