aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib/active_support/json
Commit message (Expand)AuthorAgeFilesLines
* Enabled quirks mode on JSON.parse, fixes broken test in af9caaeGodfrey Chan2013-09-121-1/+1
* Replace JSON.load with JSON.parse, also removed the proc parameterGodfrey Chan2013-09-111-2/+2
* Remove active_support/json/variable was deprecated.kennyj2013-06-012-19/+0
* Replace multi_json with jsonErik Michaels-Ober2013-05-111-21/+4
* Merge pull request #10534 from cmaruz/masterRafael Mendonça França2013-05-101-1/+4
|\
| * Added escaping of U+2028 and U+2029 inside the json encoder.Mario Caropreso2013-05-091-3/+6
* | Fix syntax error on Ruby 2.0Rafael Mendonça França2013-05-101-2/+4
* | Escape multibyte line terminators in JSON encodingzackham2013-04-021-2/+4
|/
* Revert "Simplify code in AS json encoder"Guillermo Iguaran2013-02-251-8/+15
* Merge pull request #8815 from bogdan/simplified-to-json-argsSteve Klabnik2013-02-241-15/+8
|\
| * Simplify code in AS json encoderBogdan Gusiev2013-01-061-15/+8
* | prefer american spelling of 'behavior'Gosha Arinich2013-01-071-1/+1
|/
* Remove unicode character encoding from ActiveSupport::JSON.encodeBrett Carter2012-12-141-7/+1
* `#as_json` isolates options when encoding a hash. Closes #8182Yves Senn2012-11-121-1/+1
* Make caller attribute in deprecation methods optionalAlexey Gaziev2012-10-301-1/+1
* Provide a call stack for deprecation warnings where needed.Nikita Afanasenko2012-10-291-2/+3
* update AS/json docs [ci skip]Francesco Rodriguez2012-09-142-12/+20
* Add back missing requireRafael Mendonça França2012-08-071-0/+1
* Fix the deprecation horizon. [ci skip]Rafael Mendonça França2012-08-071-1/+1
* Deprecate ActiveSupport::JSON::VariableErich Menge2012-08-071-0/+17
* fixing :nodoc:s in AS::JSON::EncodingFrancesco Rodriguez2012-07-211-15/+48
* Document ActiveSupport::JSON.parse_error [ci skip]Mark Rushakoff2012-06-051-0/+8
* Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-06-021-1/+1
|\
| * Fix typo [ci skip]Erich Menge2012-05-301-1/+1
* | Merge pull request #6554 from erichmenge/remove-json-variablePiotr Sarnacki2012-05-302-10/+0
|\ \ | |/ |/|
| * Remove deprecated ActiveSupport::JSON::Variable.Erich Menge2012-05-302-10/+0
* | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-05-302-1/+9
|\ \ | |/ |/|
| * add ActiveSupport::JSON.decode documentation [ci skip]Francesco Rodriguez2012-05-281-0/+5
| * add example to ActiveSupport::JSON.encode [ci skip]Francesco Rodriguez2012-05-281-1/+4
* | True, False, and Nil should be represented in as_json as themselves.Erich Menge2012-05-291-9/+9
|/
* Since escape_html_entities_in_json was moved to 3-2-stable, make it true in A...José Valim2012-05-141-1/+1
* BigDecimal string wrapping in JSON serialization can now be opted-out, fixes ...David FRANCOIS2012-05-021-1/+14
* JSON: encode BigDecimal NaN/Infinity as null.Sebi Burkhard2012-05-011-1/+3
* Merge pull request #2532 from hasclass/as_json__encode_infinite_and_nan_float...Piotr Sarnacki2012-04-301-0/+4
|\
| * JSON: Encode infinite or NaN floats as null to generate valid JSON.Sebi Burkhard2011-08-151-0/+4
* | fixed broken build after multi_json upgradeArun Agrawal2012-04-161-3/+3
* | Replaced OrderedHash usage with Ruby 1.9 HashUddhava2012-02-091-3/+1
* | fixes in api docsVijay Dev2012-01-131-2/+2
* | Remove Array.wrap calls in ActiveSupportRafael Mendonça França2012-01-061-3/+2
* | use #to_s to convert Range to jsonSergey Nartimov2012-01-011-0/+4
* | remove checks for encodings availabilitySergey Nartimov2011-12-251-5/+3
* | Revert "Implement ArraySerializer and move old serialization API to a new nam...José Valim2011-11-301-1/+1
* | Implement ArraySerializer and move old serialization API to a new namespace.José Valim2011-11-231-4/+4
* | Set the default options value for as_json in the encoder object.José Valim2011-09-301-2/+2
|/
* Removed deprecated methods and related tests from ActiveSupportJosh Kalderimis2011-05-251-3/+0
* Use set data structure to speed up circular reference checks on large/deeply ...Andy Lindeman2011-05-231-4/+4
* add missing require for ordered_hash dependencyCorin Langosch2011-05-111-0/+1
* Merge pull request #248 from bigfix/enumerable_as_jsonJosé Valim2011-05-071-1/+3
|\
| * Enumerable should pass encoding options to children in #as_json/#to_json.John Firebaugh2011-04-011-1/+3
* | AS Json parse_error makes a return for backwards compatibility, although it w...Josh Kalderimis2011-04-191-0/+4