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

	Commit message (Expand)	Author	Age	Files	Lines
*	Save has_one associations only if record has changes	Alan Kennedy	2013-10-31	3	-2/+24
*	Merge pull request #12706 from RobZolkos/master	Guillermo Iguaran	2013-10-30	1	-2/+6
\|\
\| *	show javascripts can be disabled in generators	Rob Zolkos	2013-10-31	1	-2/+6
\|/
*	We need to fix Sam Ruby's tests.	Aaron Patterson	2013-10-30	1	-1/+0
*	golf down rc file reading	Aaron Patterson	2013-10-30	1	-2/+1
*	add a test for whitespace separated args in the rc file	Aaron Patterson	2013-10-30	1	-0/+16
*	avoid object creation if there is no rc file	Aaron Patterson	2013-10-30	1	-1/+1
*	no need to dup, argv is never mutated	Aaron Patterson	2013-10-30	1	-1/+1
*	no need to shift	Aaron Patterson	2013-10-30	1	-2/+1
*	functionally build the argv	Aaron Patterson	2013-10-30	1	-3/+4
*	there is no reason for ARGV[0] to be nil	Aaron Patterson	2013-10-30	2	-10/+12
*	return argv from the insert method	Aaron Patterson	2013-10-30	1	-2/+3
*	return argv from more methods	Aaron Patterson	2013-10-30	1	-2/+4
*	return argv from each method	Aaron Patterson	2013-10-30	1	-4/+6
*	pass argv to each method that mutates it	Aaron Patterson	2013-10-30	1	-12/+10
*	add a comment to people of the future	Aaron Patterson	2013-10-30	1	-1/+5
*	adding a test for --help defaults	Aaron Patterson	2013-10-30	1	-0/+7
*	change the test to make argv a little more realistic	Aaron Patterson	2013-10-30	1	-7/+6
*	adding a test for the current behavior	Aaron Patterson	2013-10-30	1	-0/+18
*	add a test for the rc commandline option	Aaron Patterson	2013-10-30	1	-0/+18
*	remove useless assertions	Aaron Patterson	2013-10-30	1	-2/+0
*	test some of the rc specification	Aaron Patterson	2013-10-30	2	-4/+48
*	forgot the test, oops!	Aaron Patterson	2013-10-30	1	-0/+36
*	stop mutating ARGV	Aaron Patterson	2013-10-30	2	-3/+3
*	prepare! should return argv	Aaron Patterson	2013-10-30	1	-0/+1
*	rename AppPreparer	Aaron Patterson	2013-10-30	4	-3/+5
*	Merge branch 'master' of github.com:rails/rails	Aaron Patterson	2013-10-30	12	-233/+257
\|\
\| *	Fix release instructions	Rafael Mendonça França	2013-10-30	1	-1/+1
\| *	Merge pull request #12214 from chancancode/json_decode_does_not_take_options	Jeremy Kemper	2013-10-30	3	-5/+14
\| \|\
\| \| *	Raise an error when AS::JSON.decode is called with options	Godfrey Chan	2013-10-30	3	-5/+14
\| \|/
\| *	Merge pull request #12203 from chancancode/eager_load_json	Jeremy Kemper	2013-10-30	8	-227/+242
\| \|\
\| \| *	Moved all JSON core extensions into core_ext/object/json	Godfrey Chan	2013-09-13	8	-227/+242
* \| \|	:cut: whitespace	Aaron Patterson	2013-10-30	1	-2/+2
\|/ /
* \|	use a thread local rather than a queue so events are in the right order	Aaron Patterson	2013-10-30	1	-7/+4
* \|	no need for a CHANGELOG entry. [ci skip].	Yves Senn	2013-10-30	1	-7/+1
* \|	fix code typo in `MysqlAdapter` .Closes #12647.	Yves Senn	2013-10-30	3	-1/+22
* \|	Merge pull request #12702 from dmathieu/finetune_session_fetch	Rafael Mendonça França	2013-10-30	2	-2/+8
\|\ \
\| * \|	session#fetch doesn't behave exactly like Hash#fetch.	Damien Mathieu	2013-10-30	2	-2/+8
\|/ /
* \|	Merge pull request #12687 from notalex/master	Yves Senn	2013-10-30	1	-7/+12
\|\ \
\| * \|	Update pull request instructions as per the new Github UI	Alex Johnson	2013-10-30	1	-7/+12
\|/ /
* \|	Merge pull request #12653 from releu/short_arrays_in_inspect	Yves Senn	2013-10-30	3	-3/+19
\|\ \
\| * \|	short arrays in inspect	Jan Bernacki	2013-10-30	3	-3/+19
\|/ /
* \|	Merge pull request #12692 from dmathieu/session_fetch	Guillermo Iguaran	2013-10-29	3	-0/+37
\|\ \
\| * \|	add the fetch method to sessions	Damien Mathieu	2013-10-29	3	-0/+37
* \| \|	Merge pull request #12693 from carpodaster/convert-cdata-input-to-string	Rafael Mendonça França	2013-10-29	2	-1/+5
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	Convert CDATA input to string before gsub'ing	Carsten Zimmermann	2013-10-29	2	-1/+5
\|/ /
* \|	Merge pull request #12690 from durrantm/minor_README_change	Yves Senn	2013-10-29	1	-1/+1
\|\ \
\| * \|	Clarify that visiting http://localhost:3000 should be done in a browser.	Michael Durrant	2013-10-29	1	-1/+1
\|/ /
* \|	Merge pull request #12688 from simi/patch-1	Rafael Mendonça França	2013-10-29	1	-1/+1
\|\ \
\| * \|	Update testing.rake with more accurate description of test task.	Josef Šimánek	2013-10-29	1	-1/+1
\|/ /