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

	Commit message (Expand)	Author	Age	Files	Lines
*	`Relation#count` doesn't use options anymore.	Vipul A M	2013-10-13	3	-8/+5
*	Merge pull request #11791 from versioncontrol/includes_with_persistent_select	Rafael Mendonça França	2013-10-12	3	-1/+15
\|\
\| *	Fixes #11773 when using includes combined with select, the select statement w...	Edo Balvers	2013-10-08	3	-1/+15
* \|	Merge pull request #12507 from malavbhavsar/doc_patch	Rafael Mendonça França	2013-10-12	2	-2/+2
\|\ \
\| * \|	Some fixes in docs [ci skip]	Malav Bhavsar	2013-10-11	2	-2/+2
* \| \|	Merge pull request #12512 from sbagdat/patch-1	Andrew White	2013-10-12	1	-1/+1
\|\ \ \
\| * \| \|	Fix a writing mistake	Sıtkı Bağdat	2013-10-12	1	-1/+1
\|/ / /
* \| \|	Revert "Merge pull request #12480 from iwiznia/master"	Jeremy Kemper	2013-10-11	4	-57/+0
* \| \|	no reason to do this column addition and subtraction business	Aaron Patterson	2013-10-11	1	-1/+1
* \| \|	Merge pull request #12480 from iwiznia/master	Rafael Mendonça França	2013-10-11	4	-0/+57
\|\ \ \
\| * \| \|	flatten and flatten! methods for ActiveSupport::Duration	Ionatan Wiznia	2013-10-11	4	-0/+57
\| \|/ /
* \| \|	Merge pull request #12503 from arunagw/removed-unused-require	Rafael Mendonça França	2013-10-11	1	-1/+0
\|\ \ \
\| * \| \|	No need to require rbconfig as we are using Gem.ruby	Arun Agrawal	2013-10-11	1	-1/+0
\|/ / /
* \| \|	refactor a little so we can remove some methods	Aaron Patterson	2013-10-10	2	-4/+1
* \| \|	the parent node is on the stack, so use it	Aaron Patterson	2013-10-10	1	-4/+4
* \| \|	pass the parent node to the construct method	Aaron Patterson	2013-10-10	1	-7/+6
* \| \|	nodes do not need to be sorted	Aaron Patterson	2013-10-10	1	-1/+1
* \| \|	delete unused code	Aaron Patterson	2013-10-10	2	-50/+0
* \| \|	merge JoinDependency as outer joins	Aaron Patterson	2013-10-10	2	-1/+31
* \| \|	stuff the join dependency object in the "anything goes" hash.	Aaron Patterson	2013-10-10	4	-6/+8
* \| \|	stop splatting things back and forth	Aaron Patterson	2013-10-10	2	-2/+2
* \| \|	simplify each method.	Aaron Patterson	2013-10-10	1	-8/+2
* \| \|	Merge pull request #12339 from tjschuck/bcrypt_cost_attr	Jeremy Kemper	2013-10-10	3	-1/+13
\|\ \ \
\| * \| \|	Use bcrypt's public cost attr, not internal constant	T.J. Schuck	2013-10-10	3	-1/+13
\|/ / /
* / /	Respect `SCRIPT_NAME` when using `redirect` with a relative path	Andrew White	2013-10-10	3	-0/+136
\|/ /
* \|	stop creating a bunch of relation objects when we can slap all the joins on a...	Aaron Patterson	2013-10-09	2	-8/+3
* \|	Merge branch 'builder-instances'	Rafael Mendonça França	2013-10-09	8	-59/+43
\|\ \
\| * \|	Method visibility will not make difference here	Rafael Mendonça França	2013-10-09	4	-8/+0
\| * \|	Remove builder instances	Rafael Mendonça França	2013-10-09	2	-22/+10
\| * \|	Extract the scope building to a class method	Rafael Mendonça França	2013-10-09	2	-10/+17
\| * \|	Remove unneeded reader	Rafael Mendonça França	2013-10-09	1	-2/+0
\| * \|	Move wrap_scope to class level	Rafael Mendonça França	2013-10-09	1	-2/+2
\| * \|	Move macro to class level	Rafael Mendonça França	2013-10-09	4	-5/+5
\| * \|	Make validate_options a class method	Rafael Mendonça França	2013-10-09	1	-3/+3
\| * \|	Make valid_options a class method	Rafael Mendonça França	2013-10-09	6	-7/+7
\| * \|	Define the association extensions without need to have a builder	Rafael Mendonça França	2013-10-09	3	-16/+15
* \| \|	Merge pull request #12488 from CoryFoy/master	Rafael Mendonça França	2013-10-09	1	-6/+16
\|\ \ \
\| * \| \|	Modifies the initialization guide to make the initializers process clearer an...	Cory Foy	2013-10-09	1	-6/+16
* \| \| \|	no need to to_sym	Aaron Patterson	2013-10-09	1	-1/+1
* \| \| \|	Merge branch 'tree'	Aaron Patterson	2013-10-09	5	-109/+105
\|\ \ \ \ \| \|/ / / \|/\| \| \|
\| * \| \|	remove dead code	Aaron Patterson	2013-10-09	1	-13/+0
\| * \| \|	add some convenient methods for avoiding array allocations	Aaron Patterson	2013-10-09	2	-3/+6
\| * \| \|	hide join_constraints inside the JoinDependency object	Aaron Patterson	2013-10-09	2	-8/+7
\| * \| \|	speed up match?	Aaron Patterson	2013-10-09	1	-0/+1
\| * \| \|	expose the root node and call it	Aaron Patterson	2013-10-09	1	-21/+11
\| * \| \|	just skip the join if it's already there	Aaron Patterson	2013-10-09	1	-14/+10
\| * \| \|	speed up finding existing nodes	Aaron Patterson	2013-10-09	1	-3/+1
\| * \| \|	make node search more efficient	Aaron Patterson	2013-10-09	4	-3/+43
\| * \| \|	remove == so we can see where walking up parents occurs	Aaron Patterson	2013-10-09	4	-25/+15
\| * \| \|	push parent up to the superclass	Aaron Patterson	2013-10-09	3	-7/+11