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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge branch '3-2-sec' into 3-2-secmerge	Aaron Patterson	2012-12-23	1	-0/+12
\|\
\| *	CVE-2012-5664 options hashes should only be extracted if there are extra para...	Aaron Patterson	2012-12-23	1	-0/+12
* \|	Serialized attribute can be serialized in an integer column	Rafael Mendonça França	2012-12-21	3	-2/+32
* \|	Backport #8522, Keep index names when using with sqlite3	Yves Senn	2012-12-19	1	-0/+12
* \|	recognize migrations, in folders containing numbers and 'rb'.	Yves Senn	2012-12-13	2	-0/+17
* \|	Improve test name related to cache timestamp format [ci skip]	Carlos Antonio da Silva	2012-12-11	1	-1/+1
* \|	Add :nsec format only for Ruby 1.9	Carlos Antonio da Silva	2012-12-11	1	-0/+4
* \|	Run backported serialized test without Identity Map	Carlos Antonio da Silva	2012-12-11	1	-2/+4
* \|	Use 1.8 hash style :bomb:	Carlos Antonio da Silva	2012-12-11	1	-2/+2
* \|	Merge pull request #8441 from itzki/fix_decorate_columns	Carlos Antonio da Silva	2012-12-11	1	-0/+13
* \|	Allow users to choose the timestamp format in the cache key	Rafael Mendonça França	2012-12-10	2	-1/+15
* \|	Make sure the tests pass in the case closer to described in #8195	Rafael Mendonça França	2012-12-10	4	-19/+14
* \|	Merge pull request #6376 from jgaskins/timestamp-microseconds	Jeremy Kemper	2012-12-10	1	-1/+1
* \|	Added regression test for #8195.	jacobstr	2012-12-10	1	-0/+18
* \|	Remove warning of unused variable	Rafael Mendonça França	2012-12-10	1	-1/+1
* \|	Unscope update_column(s) query to ignore default scope	Carlos Antonio da Silva	2012-12-06	1	-0/+8
* \|	backport #8403, no intermediate AR objects when eager loading.	Yves Senn	2012-12-04	2	-0/+15
* \|	Merge pull request #4942 from bogdan/pluck_joins	José Valim	2012-12-03	1	-0/+10
* \|	Merge pull request #7689 from cbarton/assume_migration_version_with_prefix_fix	Aaron Patterson	2012-11-28	1	-8/+28
\|\ \
\| * \|	Making test accurately reflect what is going on in the schema migrations test	Chris Barton	2012-09-18	1	-8/+28
* \| \|	Use 1.8 hash style in pg specific schema	Carlos Antonio da Silva	2012-11-28	1	-3/+3
* \| \|	Merge pull request #8311 from alisdair/dirty-nullable-datetime	Carlos Antonio da Silva	2012-11-25	1	-0/+14
* \| \|	backport #8291, prevent mass assignment of polymorphic type with `build`	Yves Senn	2012-11-22	1	-0/+8
* \| \|	Merge pull request #8276 from pwnall/pgsql_text_limits	Rafael Mendonça França	2012-11-20	2	-0/+23
* \| \|	Merge pull request #8258 from kommen/eager_loading_with_select_test2	Carlos Antonio da Silva	2012-11-19	1	-0/+14
* \| \|	Merge pull request #7983 from georgebrock/bug7950-squashed	Carlos Antonio da Silva	2012-11-16	1	-0/+7
\|\ \ \
\| * \| \|	Test/changelog for has_many bug on unsaved records	George Brocklehurst	2012-11-10	1	-0/+7
* \| \| \|	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	1	-0/+6
\|\ \ \ \
\| * \| \| \|	backport #8176, `#pluck` can be used on a relation with `select` clause.	Yves Senn	2012-11-13	1	-0/+6
* \| \| \| \|	Merge pull request #8204 from nikitug/fix_dynamic_finder_result_check	Rafael Mendonça França	2012-11-13	2	-0/+11
\|\ \ \ \ \
\| * \| \| \| \|	Use nil? instead of blank? to check dynamic finder result	Nikita Afanasenko	2012-11-13	2	-0/+11
* \| \| \| \| \|	Fix deleting from a HABTM join table upon destroying an object of a model wit...	Nick Rogers	2012-11-13	4	-1/+25
\|/ / / / /
* / / / /	Backport #8074 to 3-2-stable. Use query cache/uncache, when using not only da...	kennyj	2012-11-14	1	-0/+11
\|/ / / /
* \| \| \|	Fix warning with assigned but not used variable	Carlos Antonio da Silva	2012-11-13	1	-3/+3
* \| \| \|	Update mocha version to 0.13.0 and change requires	Carlos Antonio da Silva	2012-11-13	1	-1/+1
* \| \| \|	Merge pull request #8154 from bogdan/has_one_association_performance	Carlos Antonio da Silva	2012-11-12	1	-0/+6
\|/ / /
* \| \|	Backport #8078: Fix `attributes_before_type_cast` for serialised attributes.	Nikita Afanasenko	2012-11-09	1	-0/+10
* \| \|	Merge pull request #7987 from alexisbernard/3-2_find_in_batches_compatible_wi...	Santiago Pastorino	2012-11-08	1	-1/+22
\|\ \ \
\| * \| \|	Fix find_in_batches against string IDs when start option is not specified.	Alexis Bernard	2012-11-08	1	-0/+9
\| * \| \|	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	1	-0/+15
\| \| \|/ \| \|/\|
* \| \|	Use a more descriptive test name	Rafael Mendonça França	2012-11-08	1	-1/+1
* \| \|	Fix accepts_nested_attributes for child classes	Gabriel Sobrinho & Ricardo Henrique	2012-11-07	1	-0/+11
\|/ /
* \|	Ensure calling first/last with options correctly set inverse association	Carlos Antonio da Silva	2012-11-01	1	-0/+8
* \|	Fix issue with collection associations and first(n)/last(n)	Carlos Antonio da Silva	2012-11-01	1	-0/+12
* \|	relaxes assertion	Xavier Noria	2012-10-31	1	-1/+1
* \|	Fix ActiveRecord#update_column return value	saksmlz	2012-10-31	1	-0/+6
* \|	Fix bug when Column is trying to type cast boolean values to integer.	Rafael Mendonça França	2012-10-29	1	-4/+4
* \|	fixed support for DATABASE_URL for rake db tasks	Grace Liu	2012-10-29	1	-2/+0