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

	Commit message (Expand)	Author	Age	Files	Lines
...
* \| \|	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
* \| \|	Merge pull request #8149 from senny/backport_7842_to_rails_3_2_stable	Rafael Mendonça França	2012-11-08	3	-1/+11
\|\ \ \
\| * \| \|	backport, handle trailing slash with engines	Yves Senn	2012-11-08	3	-1/+11
\|/ / /
* \| \|	Merge pull request #7987 from alexisbernard/3-2_find_in_batches_compatible_wi...	Santiago Pastorino	2012-11-08	3	-3/+28
\|\ \ \
\| * \| \|	Fix find_in_batches against string IDs when start option is not specified.	Alexis Bernard	2012-11-08	3	-2/+15
\| * \| \|	Fix test_find_in_batches_should_use_any_column_as_primary_key	Santiago Pastorino	2012-11-08	1	-11/+8
\| * \| \|	start could be a string	Santiago Pastorino	2012-11-08	2	-1/+16
\| \|/ /
* \| \|	Use a more descriptive test name	Rafael Mendonça França	2012-11-08	1	-1/+1
* \| \|	Fix the release in the CHANGELOG [ci skip]	Rafael Mendonça França	2012-11-08	1	-1/+4
* \| \|	Merge pull request #8108 from Casecommons/fix-multiple-and-index-in-instance-tag	Rafael Mendonça França	2012-11-08	3	-1/+34
* \| \|	Merge pull request #8138 from sobrinho/3-2-stable	Rafael Mendonça França	2012-11-08	3	-3/+41
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	Fix accepts_nested_attributes for child classes	Gabriel Sobrinho & Ricardo Henrique	2012-11-07	3	-3/+41
\|/ /
* \|	Clear url helpers when reloading routes	Santiago Pastorino	2012-11-02	2	-0/+5
* \|	Add test to avoid regression of 4a86362	Rafael Mendonça França	2012-11-02	1	-0/+10
* \|	Revert "Merge pull request #7668 from Draiken/fix_issue_6497"	Rafael Mendonça França	2012-11-02	3	-18/+7
* \|	Bump to 3.2.9.rc2	Santiago Pastorino	2012-11-01	9	-9/+9
* \|	Ensure calling first/last with options correctly set inverse association	Carlos Antonio da Silva	2012-11-01	2	-1/+11
* \|	Fix issue with collection associations and first(n)/last(n)	Carlos Antonio da Silva	2012-11-01	3	-3/+20
* \|	relaxes assertion	Xavier Noria	2012-10-31	1	-1/+1
* \|	Merge pull request #8083 from saks/fix_update_column_return_value	José Valim	2012-10-31	2	-1/+7
\|\ \
\| * \|	Fix ActiveRecord#update_column return value	saksmlz	2012-10-31	2	-1/+7
\|/ /
* \|	Revert "Merge pull request #7659 from HugoLnx/template_error_no_matches_rebased"	Rafael Mendonça França	2012-10-31	4	-37/+14
* \|	Revert "Merge pull request #7797 from senny/7459_prefix_tempalte_assertion_va...	Rafael Mendonça França	2012-10-30	3	-23/+31