rails.git - Mirror of official rails repo with custom fixes.

	Commit message (Expand)	Author	Age	Files	Lines
*	Enabled quirks mode on JSON.parse, fixes broken test in af9caae	Godfrey Chan	2013-09-12	1	-1/+1
*	Replace JSON.load with JSON.parse, also removed the proc parameter	Godfrey Chan	2013-09-11	1	-2/+2
*	Remove active_support/json/variable was deprecated.	kennyj	2013-06-01	2	-19/+0
*	Replace multi_json with json	Erik Michaels-Ober	2013-05-11	1	-21/+4
*	Merge pull request #10534 from cmaruz/master	Rafael Mendonça França	2013-05-10	1	-1/+4
\|\
\| *	Added escaping of U+2028 and U+2029 inside the json encoder.	Mario Caropreso	2013-05-09	1	-3/+6
* \|	Fix syntax error on Ruby 2.0	Rafael Mendonça França	2013-05-10	1	-2/+4
* \|	Escape multibyte line terminators in JSON encoding	zackham	2013-04-02	1	-2/+4
\|/
*	Revert "Simplify code in AS json encoder"	Guillermo Iguaran	2013-02-25	1	-8/+15
*	Merge pull request #8815 from bogdan/simplified-to-json-args	Steve Klabnik	2013-02-24	1	-15/+8
\|\
\| *	Simplify code in AS json encoder	Bogdan Gusiev	2013-01-06	1	-15/+8
* \|	prefer american spelling of 'behavior'	Gosha Arinich	2013-01-07	1	-1/+1
\|/
*	Remove unicode character encoding from ActiveSupport::JSON.encode	Brett Carter	2012-12-14	1	-7/+1
*	`#as_json` isolates options when encoding a hash. Closes #8182	Yves Senn	2012-11-12	1	-1/+1
*	Make caller attribute in deprecation methods optional	Alexey Gaziev	2012-10-30	1	-1/+1
*	Provide a call stack for deprecation warnings where needed.	Nikita Afanasenko	2012-10-29	1	-2/+3
*	update AS/json docs [ci skip]	Francesco Rodriguez	2012-09-14	2	-12/+20
*	Add back missing require	Rafael Mendonça França	2012-08-07	1	-0/+1
*	Fix the deprecation horizon. [ci skip]	Rafael Mendonça França	2012-08-07	1	-1/+1
*	Deprecate ActiveSupport::JSON::Variable	Erich Menge	2012-08-07	1	-0/+17
*	fixing :nodoc:s in AS::JSON::Encoding	Francesco Rodriguez	2012-07-21	1	-15/+48
*	Document ActiveSupport::JSON.parse_error [ci skip]	Mark Rushakoff	2012-06-05	1	-0/+8
*	Merge branch 'master' of github.com:lifo/docrails	Vijay Dev	2012-06-02	1	-1/+1
\|\
\| *	Fix typo [ci skip]	Erich Menge	2012-05-30	1	-1/+1
* \|	Merge pull request #6554 from erichmenge/remove-json-variable	Piotr Sarnacki	2012-05-30	2	-10/+0
\|\ \ \| \|/ \|/\|
\| *	Remove deprecated ActiveSupport::JSON::Variable.	Erich Menge	2012-05-30	2	-10/+0
* \|	Merge branch 'master' of github.com:lifo/docrails	Vijay Dev	2012-05-30	2	-1/+9
\|\ \ \| \|/ \|/\|
\| *	add ActiveSupport::JSON.decode documentation [ci skip]	Francesco Rodriguez	2012-05-28	1	-0/+5
\| *	add example to ActiveSupport::JSON.encode [ci skip]	Francesco Rodriguez	2012-05-28	1	-1/+4
* \|	True, False, and Nil should be represented in as_json as themselves.	Erich Menge	2012-05-29	1	-9/+9
\|/
*	Since escape_html_entities_in_json was moved to 3-2-stable, make it true in A...	José Valim	2012-05-14	1	-1/+1
*	BigDecimal string wrapping in JSON serialization can now be opted-out, fixes ...	David FRANCOIS	2012-05-02	1	-1/+14
*	JSON: encode BigDecimal NaN/Infinity as null.	Sebi Burkhard	2012-05-01	1	-1/+3
*	Merge pull request #2532 from hasclass/as_json__encode_infinite_and_nan_float...	Piotr Sarnacki	2012-04-30	1	-0/+4
\|\
\| *	JSON: Encode infinite or NaN floats as null to generate valid JSON.	Sebi Burkhard	2011-08-15	1	-0/+4
* \|	fixed broken build after multi_json upgrade	Arun Agrawal	2012-04-16	1	-3/+3
* \|	Replaced OrderedHash usage with Ruby 1.9 Hash	Uddhava	2012-02-09	1	-3/+1
* \|	fixes in api docs	Vijay Dev	2012-01-13	1	-2/+2
* \|	Remove Array.wrap calls in ActiveSupport	Rafael Mendonça França	2012-01-06	1	-3/+2
* \|	use #to_s to convert Range to json	Sergey Nartimov	2012-01-01	1	-0/+4
* \|	remove checks for encodings availability	Sergey Nartimov	2011-12-25	1	-5/+3
* \|	Revert "Implement ArraySerializer and move old serialization API to a new nam...	José Valim	2011-11-30	1	-1/+1
* \|	Implement ArraySerializer and move old serialization API to a new namespace.	José Valim	2011-11-23	1	-4/+4
* \|	Set the default options value for as_json in the encoder object.	José Valim	2011-09-30	1	-2/+2
\|/
*	Removed deprecated methods and related tests from ActiveSupport	Josh Kalderimis	2011-05-25	1	-3/+0
*	Use set data structure to speed up circular reference checks on large/deeply ...	Andy Lindeman	2011-05-23	1	-4/+4
*	add missing require for ordered_hash dependency	Corin Langosch	2011-05-11	1	-0/+1
*	Merge pull request #248 from bigfix/enumerable_as_json	José Valim	2011-05-07	1	-1/+3
\|\
\| *	Enumerable should pass encoding options to children in #as_json/#to_json.	John Firebaugh	2011-04-01	1	-1/+3
* \|	AS Json parse_error makes a return for backwards compatibility, although it w...	Josh Kalderimis	2011-04-19	1	-0/+4