diff options
| author | Vijay Dev <vijaydev.cse@gmail.com> | 2012-06-02 21:50:02 +0530 |
|---|---|---|
| committer | Vijay Dev <vijaydev.cse@gmail.com> | 2012-06-02 21:50:02 +0530 |
| commit | 40d5303b4f1f32b1f97259052bd200a7e0792c7e (patch) | |
| tree | 6879c06ca0b513636a8d882159a2da07ea701529 /activesupport/lib/active_support | |
| parent | a769fe9db16a792164363b49e4c7f07f6e412eaa (diff) | |
| parent | ab2bf8148c8000a5185b11b6c1b11d94ae33053d (diff) | |
| download | rails-40d5303b4f1f32b1f97259052bd200a7e0792c7e.tar.gz rails-40d5303b4f1f32b1f97259052bd200a7e0792c7e.tar.bz2 rails-40d5303b4f1f32b1f97259052bd200a7e0792c7e.zip | |
Merge branch 'master' of github.com:lifo/docrails
Diffstat (limited to 'activesupport/lib/active_support')
| -rw-r--r-- | activesupport/lib/active_support/json/encoding.rb | 2 |
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 6ed253e141..c319e94bc6 100644 --- a/activesupport/lib/active_support/json/encoding.rb +++ b/activesupport/lib/active_support/json/encoding.rb @@ -191,7 +191,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 |