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

	Commit message (Expand)	Author	Age	Files	Lines
...
* \|	clear shouldnt fire callbacks so remove order test	eileencodes	2014-04-28	1	-3/+0
* \|	rewrite test to correctly test clear method	eileencodes	2014-04-28	1	-2/+2
* \|	Merge pull request #14853 from kassio/kb-fix-custom-join-table-habtm	Yves Senn	2014-04-25	1	-0/+5
\|\ \
\| * \|	Fix custom join_table name on habtm reflections	Kassio Borges	2014-04-25	1	-0/+5
* \| \|	Merge branch 'master' into adequaterecord	Aaron Patterson	2014-04-25	1	-4/+16
\|\\| \|
\| * \|	Perfer to define methods instead of calling test	Rafael Mendonça França	2014-04-22	1	-4/+4
\| * \|	Fix syntax error	Rafael Mendonça França	2014-04-22	1	-0/+1
\| * \|	Merge pull request #14573 from habermann24/has_many_through_fix	Rafael Mendonça França	2014-04-22	1	-0/+11
\| \|\ \
\| \| * \|	Properly handle scoping with has_many :through. Fixes #14537.	Jan Habermann	2014-04-03	1	-0/+12
* \| \| \|	Merge branch 'master' into adequaterecord	Aaron Patterson	2014-04-14	3	-4/+45
\|\\| \| \|
\| * \| \|	Merge pull request #14735 from byroot/idempotent-counter-caches	Aaron Patterson	2014-04-14	1	-0/+21
\| \|\ \ \
\| \| * \| \|	Write the failing test case for concurrent counter cache	Jean Boussier	2014-04-13	1	-0/+21
\| * \| \| \|	Just call read_attribute, no need to use `send`.	Lauro Caetano	2014-04-14	1	-3/+3
\| \|/ / /
\| * \| \|	:scissors:	Rafael Mendonça França	2014-04-11	1	-2/+2
\| * \| \|	Merge pull request #14711 from swoker/activerecord_fix_aggregate_methods_with...	Rafael Mendonça França	2014-04-11	1	-0/+8
\| \|\ \ \
\| \| * \| \|	fix exception on polymorphic associations with predicates	Simon Woker	2014-04-11	1	-0/+8
\| * \| \| \|	Merge pull request #12829 from iantropov/issue_insert_via_hmt_scope_3548	Rafael Mendonça França	2014-04-10	1	-1/+13
\| \|\ \ \ \ \| \| \|/ / / \| \|/\| \| \|
\| \| * \| \|	Fix insertion of records for hmt association with scope, fix #3548	Ivan Antropov	2013-11-17	1	-1/+13
* \| \| \| \|	Merge branch 'master' into adequaterecord	Aaron Patterson	2014-04-07	4	-5/+68
\|\\| \| \| \|
\| * \| \| \|	Fix the test defining the models in the right place	Rafael Mendonça França	2014-04-04	1	-15/+5
\| * \| \| \|	Merge pull request #11650 from prathamesh-sonpatki/rename	Rafael Mendonça França	2014-04-04	1	-0/+18
\| \|\ \ \ \
\| \| * \| \| \|	[Active Record] Renamed private methods create_record and update_record	Prathamesh Sonpatki	2014-02-20	1	-0/+18
\| * \| \| \| \|	Remove unused variable	Rafael Mendonça França	2014-04-04	1	-1/+1
\| * \| \| \| \|	Fix error when using `with_options` with lambda.	Lauro Caetano	2014-04-03	1	-0/+9
\| * \| \| \| \|	Merge pull request #14546 from eileencodes/fix_delete_all_to_not_use_IN_state...	Aaron Patterson	2014-03-31	1	-1/+16
\| \|\ \ \ \ \ \| \| \|_\|_\|/ / \| \|/\| \| \| \|
\| \| * \| \| \|	add test to compare sql statements in delete_all query	eileencodes	2014-03-31	1	-1/+16
\| * \| \| \| \|	Simplify Preloader#grouped_records code.	thedarkone	2014-03-30	1	-4/+4
\| * \| \| \| \|	Fix polymorphic preloads on NOT NULL _type columns.	thedarkone	2014-03-30	1	-0/+11
\| \|/ / / /
\| * \| \| \|	Merge pull request #14154 from al2o3cr/issue12770	Aaron Patterson	2014-03-27	1	-0/+9
\| \|\ \ \ \
\| \| * \| \| \|	Pass a base relation to build_default_scope when joining	Matt Jones	2014-02-21	1	-0/+9
\| * \| \| \| \|	Use rails convetions	Rafael Mendonça França	2014-03-25	1	-2/+2
\| * \| \| \| \|	Merge pull request #14390 from huoxito/true-touch	Rafael Mendonça França	2014-03-25	1	-0/+11
\| \|\ \ \ \ \
\| \| * \| \| \| \|	Still touch associations when theres no timestamp	Washington Luiz	2014-03-14	1	-0/+11
* \| \| \| \| \| \|	Merge branch 'master' into adequaterecord	Aaron Patterson	2014-03-25	5	-3/+48
\|\\| \| \| \| \| \|
\| * \| \| \| \| \|	Add counter cache test for class_name	Arthur Neves	2014-03-17	1	-0/+11
\| * \| \| \| \| \|	`where.not` adds `references` for `includes`.	Yves Senn	2014-03-17	1	-0/+10
\| * \| \| \| \| \|	Merge pull request #14380 from tgxworld/use_teardown_helper_method_in_activer...	Yves Senn	2014-03-15	2	-3/+3
\| \|\ \ \ \ \ \
\| \| * \| \| \| \| \|	Use teardown helper method.	Guo Xiang Tan	2014-03-14	2	-3/+3
\| \| \|/ / / / /
\| * / / / / /	Obey `validate: false` option for habtm	Carlos Antonio da Silva	2014-03-14	1	-0/+24
\| \|/ / / / /
* \| \| \| \| \|	Merge branch 'master' into adequaterecord	Aaron Patterson	2014-03-13	1	-3/+3
\|\\| \| \| \| \|
\| * \| \| \| \|	passing an instance of an AR object to `find` is deprecated	Aaron Patterson	2014-03-13	1	-3/+3
* \| \| \| \| \|	Merge branch 'master' into adequaterecord	Aaron Patterson	2014-03-13	3	-1/+20
\|\\| \| \| \| \|
\| * \| \| \| \|	Replace map.flatten with flat_map in activerecord	Erik Michaels-Ober	2014-03-03	1	-1/+1
\| * \| \| \| \|	Remove unnecessary db call when replacing.	Arthur Neves	2014-02-28	1	-0/+10
\| * \| \| \| \|	`includes` uses SQL parsing when String joins are involved.	Yves Senn	2014-02-28	1	-0/+9
* \| \| \| \| \|	Merge branch 'master' into adequaterecord	Aaron Patterson	2014-02-26	3	-10/+28
\|\\| \| \| \| \|
\| * \| \| \| \|	let `insert_record` actuall save the object.	Aaron Patterson	2014-02-25	1	-0/+21
\| \|/ / / /
\| * \| \| \|	Revert "context in validation goes through has many relationship"	Aaron Patterson	2014-02-20	1	-10/+0
\| * \| \| \|	Add regression test for collection proxy reader	Arthur Neves	2014-02-20	1	-0/+7
\| \|/ / /
* \| \| \|	Merge branch 'master' into adequaterecord	Aaron Patterson	2014-02-17	1	-2/+2
\|\\| \| \|