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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge pull request #5832 from kennyj/fix_5267	Jon Leighton	2012-04-13	2	-3/+7
\|\
\| *	Fix wrong return value from reset_sequence_name method.	kennyj	2012-04-14	2	-3/+7
* \|	move some of the update_all implementation to active_record_deprecated_finders	Jon Leighton	2012-04-13	1	-27/+14
* \|	Merge pull request #5814 from lest/patch-4	Piotr Sarnacki	2012-04-13	1	-12/+13
\|\ \
\| * \|	don't duplicate default values in text helper	Sergey Nartimov	2012-04-11	1	-12/+13
* \| \|	now we can just manipulate the values hash in #only and #except	Jon Leighton	2012-04-13	4	-36/+26
* \| \|	use a hash to store relation values	Jon Leighton	2012-04-13	5	-52/+74
\| \|/ \|/\|
* \|	Merge pull request #5823 from avakhov/ac-test-case-remove-obsolete-code	Jon Leighton	2012-04-13	1	-3/+0
\|\ \
\| * \|	Remove obsolete code	Alexey Vakhov	2012-04-12	1	-3/+0
* \| \|	doesn't make sense for select! to take a block	Jon Leighton	2012-04-13	1	-8/+3
* \| \|	remove apply_finder_options call from AssociationScope	Jon Leighton	2012-04-13	4	-9/+15
* \| \|	Make Relation#extending work like other value methods	Jon Leighton	2012-04-13	5	-27/+22
* \| \|	Add Relation#merge!	Jon Leighton	2012-04-13	2	-9/+17
* \| \|	assert valid keys	Jon Leighton	2012-04-13	3	-0/+11
* \| \|	Allow Relation#merge to take a hash	Jon Leighton	2012-04-13	4	-49/+95
* \| \|	we have no need for the ASSOCIATION_METHODS constant	Jon Leighton	2012-04-13	4	-15/+11
* \| \|	we don't need to test that constant assignment works	Jon Leighton	2012-04-13	1	-15/+0
* \| \|	refactoring	Jon Leighton	2012-04-13	1	-36/+45
* \| \|	Extract clusterfuck method for surgery	Jon Leighton	2012-04-13	2	-71/+92
* \| \|	Merge pull request #5830 from raganwald/master	Xavier Noria	2012-04-12	1	-1/+3
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	mention that coercion only happens when the primary key is an integer and use...	Reg Braithwaite	2012-04-12	1	-2/+2
\| * \|	Documents that ActiveRecord's find by id uses to_i to coerce its arguments to...	Reg Braithwaite	2012-04-12	1	-1/+3
\|/ /
* \|	Add bang versions of relation query methods.	Jon Leighton	2012-04-12	3	-84/+194
* \|	#send_file leans on Rack::Sendfile to X-Accel-Redirect the file's path, so op...	Jeremy Kemper	2012-04-12	1	-1/+21
* \|	Merge branch 'master' of github.com:lifo/docrails	Vijay Dev	2012-04-12	6	-8/+11
\|\ \
\| * \|	Fixed markup in security guide	Alfonso Cora	2012-04-12	1	-1/+1
\| * \|	Grammar fix in 3.2 Release Notes guide	Tim Harvey	2012-04-11	1	-1/+1
\| * \|	copy editing [ci skip]	Vijay Dev	2012-04-11	1	-3/+2
\| * \|	Revert "add instructions for adding additional manifests"	Vijay Dev	2012-04-11	1	-5/+1
\| * \|	fix bad format [ci skip]	Vijay Dev	2012-04-11	1	-1/+1
\| * \|	Fix small markup error; fix incorrect link	Jonathan Mazin	2012-04-09	1	-2/+2
\| * \|	Merge branch 'master' of github.com:lifo/docrails	Patrick Sharp	2012-04-09	1	-2/+2
\| \|\ \
\| \| * \|	Fix code example in generator test case	Prem Sichanugrist	2012-04-09	1	-2/+2
\| * \| \|	add instructions for adding additional manifests	Patrick Sharp	2012-04-09	1	-1/+5
\| \|/ /
\| * \|	Added instructions on port number	Gaurish Sharma	2012-04-09	1	-0/+4
\| * \|	fix doc for ActiveSupport::Callbacks::Callback#define_conditional_callback	Jan Xie	2012-04-08	1	-1/+1
* \| \|	avoid autolinking by rdoc [ci skip]	Vijay Dev	2012-04-12	1	-2/+2
* \| \|	Merge pull request #2733 from dasch/improve-delegate	Jon Leighton	2012-04-12	3	-10/+35
\|\ \ \
\| * \| \|	Remove the addition to the guides	Daniel Schierbeck	2012-04-12	1	-20/+0
\| * \| \|	Add changelog entry	Daniel Schierbeck	2012-04-12	1	-0/+2
\| * \| \|	Remove Module#delegate!	Daniel Schierbeck	2012-04-12	1	-52/+0
\| * \| \|	Add back the old `deprecate` method as `deprecate!`	Daniel Schierbeck	2012-04-12	1	-0/+52
\| * \| \|	Document the changes to delegate in the guides	Daniel Schierbeck	2012-04-12	1	-0/+20
\| * \| \|	Change API docs regarding delegation to non-public methods	Daniel Schierbeck	2012-04-12	1	-1/+1
\| * \| \|	Optimize the performance of #delegate	Daniel Schierbeck	2012-04-12	2	-9/+32
* \| \| \|	Merge pull request #5722 from kennyj/some_refactor_for_association	Jon Leighton	2012-04-12	3	-8/+7
\|\ \ \ \
\| * \| \| \|	Some refactor for association.	kennyj	2012-04-12	3	-8/+7
\|/ / / /
* \| \| \|	move apply_finder_options to active_record_deprecated_finders	Jon Leighton	2012-04-12	1	-22/+0
* \| \| \|	add active_record_deprecated_finders as a dep	Jon Leighton	2012-04-12	3	-0/+9
\|/ / /
* \| \|	Merge pull request #5746 from jmbejar/index_method_form_builder	Santiago Pastorino	2012-04-11	3	-5/+74
\|\ \ \