diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2013-11-06 10:26:02 -0800 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2013-11-06 10:26:02 -0800 |
| commit | 0f5a36eb4c344ab84d45adc76239a9bd82b87684 (patch) | |
| tree | 912c2a18d3fd91292f48515f818965cdb90695c7 /activesupport/lib/active_support/core_ext | |
| parent | aeaf3a9d0094d527f6f79ba48747bb2b28c9d30a (diff) | |
| parent | ff1192fea40c55a11c52e26f22a814d68d058170 (diff) | |
| download | rails-0f5a36eb4c344ab84d45adc76239a9bd82b87684.tar.gz rails-0f5a36eb4c344ab84d45adc76239a9bd82b87684.tar.bz2 rails-0f5a36eb4c344ab84d45adc76239a9bd82b87684.zip | |
Merge pull request #12783 from chancancode/eliminate_direct_json_gem_use
Eliminate `JSON.{parse,load,generate,dump}` and `def to_json`
Diffstat (limited to 'activesupport/lib/active_support/core_ext')
| -rw-r--r-- | activesupport/lib/active_support/core_ext/object/json.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/core_ext/object/json.rb b/activesupport/lib/active_support/core_ext/object/json.rb index c50cd57c2c..e2a89f5760 100644 --- a/activesupport/lib/active_support/core_ext/object/json.rb +++ b/activesupport/lib/active_support/core_ext/object/json.rb @@ -91,7 +91,7 @@ end class Float # Encoding Infinity or NaN to JSON should return "null". The default returns - # "Infinity" or "NaN" which breaks parsing the JSON. E.g. JSON.parse('[NaN]'). + # "Infinity" or "NaN" which are not valid JSON. def as_json(options = nil) #:nodoc: finite? ? self : nil end |