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

	Commit message (Expand)	Author	Age	Files	Lines
*	improve error message when include assertions fail	Michael Grosser	2016-09-16	1	-3/+3
*	modernizes hash syntax in activerecord	Xavier Noria	2016-08-06	1	-3/+3
*	applies new string literal convention in activerecord/test	Xavier Noria	2016-08-06	1	-17/+17
*	Properly include the `from` clause when merging relations	Sean Griffin	2016-01-14	1	-0/+7
*	Remove Relation#bind_params	Sean Griffin	2015-01-27	1	-2/+2
*	Use an `Attribute` object to represent a bind value	Sean Griffin	2015-01-27	1	-11/+0
*	Remove all cases of manuallly wrapping `Arel::Nodes::Quoted`	Sean Griffin	2014-12-29	1	-2/+2
*	Inform Arel we don't need additional type casting in tests	Sean Griffin	2014-12-26	1	-2/+2
*	Build fix when running in isolation	Arun Agrawal	2014-11-14	1	-0/+1
*	Load :developers fixtures where expecting a Developer to be there	Akira Matsuda	2014-09-05	1	-1/+1
*	"warning: assigned but unused variable"	Akira Matsuda	2014-08-21	1	-1/+1
*	Only merge scopes with zero arity in has_many through	Agis-	2014-08-20	1	-0/+13
*	Merge pull request #15078 from nbudin/fix_merger_filter_binds_comparison_master	Rafael Mendonça França	2014-05-14	1	-0/+5
\|\
\| *	Make filter_binds filter out symbols that are equal to strings	Nat Budin	2014-05-14	1	-0/+5
\|/
*	Modify assert conditions not to be affected	Yasuo Honda	2014-05-12	1	-2/+3
*	remove the bind substitution visitor. to_sql should never return bind values	Aaron Patterson	2014-04-09	1	-3/+1
*	Merge branch 'master' into set_binds	Aaron Patterson	2014-01-14	1	-2/+2
\|\
* \|	where uses bind values so we don't need to manually create them	Aaron Patterson	2014-01-14	1	-11/+3
* \|	remove test that does not apply anymore	Aaron Patterson	2014-01-14	1	-12/+1
\|/
*	use arel nodes to represent non-string `order_values`.	Yves Senn	2013-11-19	1	-0/+12
*	Address test_merging_where_relations failure by adding `order("posts.id")`	Yasuo Honda	2013-11-18	1	-1/+1
*	fix weird Emacs auto indentation. [ci skip]	Yves Senn	2013-11-13	1	-8/+8
*	tests for merging Relations of different classes.	Yves Senn	2013-11-13	1	-0/+19
*	move Relation#merge tests into separate file.	Yves Senn	2013-11-13	1	-0/+131