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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge pull request #7983 from georgebrock/bug7950-squashed	Carlos Antonio da Silva	2012-11-16	8	-12/+48
\|\
\| *	Test/changelog for has_many bug on unsaved records	George Brocklehurst	2012-11-10	2	-0/+13
\| *	use bind values for join columns	Aaron Patterson	2012-11-10	6	-12/+36
* \|	Merge pull request #8235 from tilsammans/dont_escape_actionmailer_when_plaintext	José Valim	2012-11-16	3	-1/+27
* \|	Merge pull request #8227 from senny/backport_8139	Rafael Mendonça França	2012-11-15	4	-3/+18
\|\ \
\| * \|	backport #8139, `plugin new` adds dummy app tasks when necessary. …	Yves Senn	2012-11-15	4	-2/+17
\| * \|	Fixes issue #6251	David Padilla	2012-11-15	1	-1/+1
\|/ /
* \|	Merge pull request #8218 from DawidJanczak/form-tag-doc	Carlos Antonio da Silva	2012-11-14	1	-2/+2
\|\ \
\| * \|	[ci skip] Correct examples for form_tag helper.	DawidJanczak	2012-11-14	1	-2/+2
\|/ /
* \|	fix test	Jon Leighton	2012-11-13	1	-3/+3
* \|	Merge pull request #8209 from senny/backport_8176	Rafael Mendonça França	2012-11-13	3	-1/+18
\|\ \
\| * \|	backport #8176, `#pluck` can be used on a relation with `select` clause.	Yves Senn	2012-11-13	3	-1/+18
* \| \|	Merge pull request #8204 from nikitug/fix_dynamic_finder_result_check	Rafael Mendonça França	2012-11-13	4	-2/+21
\|\ \ \
\| * \| \|	Use nil? instead of blank? to check dynamic finder result	Nikita Afanasenko	2012-11-13	4	-1/+17
* \| \| \|	Merge pull request #8188 from courtland/habtm-fix-stable	Carlos Antonio da Silva	2012-11-13	6	-1/+31
\|\ \ \ \ \| \|/ / / \|/\| \| \|
\| * \| \|	Fix deleting from a HABTM join table upon destroying an object of a model wit...	Nick Rogers	2012-11-13	6	-1/+31
\|/ / /
* \| \|	Merge pull request #8205 from kennyj/fix_6951-32	Rafael Mendonça França	2012-11-13	3	-6/+22
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	Backport #8074 to 3-2-stable. Use query cache/uncache, when using not only da...	kennyj	2012-11-14	3	-6/+22
\|/ /
* \|	Revert "Use MiniTest in Ruby 1.8 if it is available."	Carlos Antonio da Silva	2012-11-13	2	-8/+1
* \|	Fix warning with assigned but not used variable	Carlos Antonio da Silva	2012-11-13	1	-3/+3
* \|	Add changelog entry for #8200 [ci skip]	Carlos Antonio da Silva	2012-11-13	1	-0/+7
* \|	Update mocha version to 0.13.0 and change requires	Carlos Antonio da Silva	2012-11-13	11	-12/+12
* \|	Fix json encoding test with ruby 1.8.7 and random hash order	Carlos Antonio da Silva	2012-11-13	1	-1/+2
* \|	Merge pull request #8200 from freerange/3-2-stable-with-mocha-fixes	Carlos Antonio da Silva	2012-11-13	3	-5/+11
\|\ \
\| * \|	Avoid a Mocha deprecation warning.	James Mead	2012-11-13	1	-1/+1
\| * \|	Fix for Test::Unit Mocha compatibility.	James Mead	2012-11-13	1	-3/+5
\| * \|	Use MiniTest in Ruby 1.8 if it is available.	James Mead	2012-11-13	1	-1/+3
\| * \|	Copy Mocha bug fix.	James Mead	2012-11-13	1	-0/+2
* \| \|	Merge pull request #8199 from senny/backport_8182	Carlos Antonio da Silva	2012-11-13	3	-1/+24
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	backport #8185, `#as_json` isolates options when encoding a hash.	Yves Senn	2012-11-13	3	-1/+24
\|/ /
* \|	Lock mocha in ~> 0.12.x until we fix the Ruby 1.8.7 issues with 0.13.0	Carlos Antonio da Silva	2012-11-12	1	-1/+1
* \|	Merge pull request #8193 from claudiob/add_rails329_release_date	Rafael Mendonça França	2012-11-12	7	-7/+7
\|\ \
\| * \|	Add release date of Rails 3.2.9 to documentation	claudiob	2012-11-12	7	-7/+7
\|/ /
* \|	Merge pull request #8154 from bogdan/has_one_association_performance	Carlos Antonio da Silva	2012-11-12	3	-1/+24
* \|	Merge branch '3-2-9' into 3-2-stable	Santiago Pastorino	2012-11-12	9	-9/+9
\|\ \ \| \|/ \|/\|
\| *	Bump to 3.2.9	Santiago Pastorino	2012-11-12	9	-9/+9
\| *	Revert "Add test case to assets eager load"	Santiago Pastorino	2012-11-09	1	-3/+0
* \|	Revert "Add test case to assets eager load"	Santiago Pastorino	2012-11-09	1	-3/+0
* \|	Merge branch '3-2-9' into 3-2-stable	Santiago Pastorino	2012-11-09	9	-9/+9
\|\\|
\| *	Bump up to 3.2.9.rc3	Santiago Pastorino	2012-11-09	9	-9/+9
\| *	Merge pull request #8161 from guilleiguaran/downgrade-sprockets	Rafael Mendonça França	2012-11-09	1	-1/+1
\| *	Revert "Respect children paths filter settings"	Santiago Pastorino	2012-11-09	2	-13/+6
* \|	Merge pull request #8161 from guilleiguaran/downgrade-sprockets	Rafael Mendonça França	2012-11-09	1	-1/+1
\|\ \
\| * \|	Lock sprockets to 2.2.x	Guillermo Iguaran	2012-11-09	1	-1/+1
\| \|/
* \|	Fix redirect example block	Carlos Antonio da Silva	2012-11-09	1	-3/+3
* \|	Revert "Respect children paths filter settings"	Santiago Pastorino	2012-11-09	2	-13/+6
* \|	Merge pull request #8082 from nikitug/backport_serialized_attributes_before_t...	Carlos Antonio da Silva	2012-11-09	3	-0/+24
\|\ \
\| * \|	Backport #8078: Fix `attributes_before_type_cast` for serialised attributes.	Nikita Afanasenko	2012-11-09	3	-0/+24
\|/ /
* \|	Merge pull request #8093 from nikitug/keep_app_x_ua_compatible	Carlos Antonio da Silva	2012-11-08	3	-1/+46
* \|	Merge pull request #8027 from daenney/master	Xavier Noria	2012-11-08	3	-3/+17