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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'master' of git://github.com/lifo/docrails	Xavier Noria	2010-10-06	1	-1/+1
\|\
\| *	Fix serialization :include option name	Evgeniy Dolzhenko	2010-10-01	1	-1/+1
\| \|
* \|	double negative is not good	Neeraj Singh	2010-09-30	1	-1/+1
\|/
*	fixed some issues with JSON encoding	Jakub Suder	2010-09-07	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \|	- as_json in ActiveModel should return a hash and handle :only/:except/:methods options - Array and Hash should call as_json on their elements - json methods should not modify options argument [#5374 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
*	Deletes trailing whitespaces (over text files only find * -type f -exec sed ↵	Santiago Pastorino	2010-08-14	1	-1/+1
\| \| \| \|	's/[ \t]*$//' -i {} \;)
*	Adds title and proper formatting to docs.	Rizwan Reza	2010-06-16	1	-0/+2
\|
*	Break up concerns for choosing what attributes should be serialized and the ↵	Joshua Peek	2009-08-13	1	-41/+39
\| \| \| \|	actual serializer
*	Integrate AMo JSON serializer into AR	Joshua Peek	2009-07-03	1	-55/+13
\|
*	Fix AR json encoding	Jeremy Kemper	2009-06-08	1	-2/+3
\|
*	Cherry-pick core extensions	Jeremy Kemper	2009-05-13	1	-8/+9
\|
*	Use Array.wrap	Jeremy Kemper	2009-04-26	1	-4/+4
\|
*	require json lib when serialization is loaded	Joshua Peek	2008-11-24	1	-0/+2
\|
*	Autoload ActiveRecord files	Joshua Peek	2008-11-24	1	-1/+1
\|
*	Improve documentation coverage and markup	Xavier Noria	2008-05-02	1	-5/+5
\| \| \| \|	Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
*	Added :include option to to_json (closes #9677) [chuyeow]	David Heinemeier Hansson	2007-09-28	1	-6/+45
\| \| \| \|	git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7663 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
*	Added ActiveRecord::Base#to_json/from_json (currently does not support ↵	David Heinemeier Hansson	2007-09-20	1	-0/+59
	:include like to_xml) [DHH]. Added ActiveRecord::Base#from_xml [DHH] git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7519 5ecf4fe2-1ee6-0310-87b1-e25e094e27de