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

	Commit message (Expand)	Author	Age	Files	Lines
*	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
\|\ \
\| * \|	Add index method to FormBuilder. Useful when you use field_for and need to kn...	Jorge Bejar	2012-04-11	3	-5/+74
* \| \|	Merge pull request #5736 from oscardelben/configuration_errors_reporting	Jon Leighton	2012-04-11	1	-3/+3
\|\ \ \
\| * \| \|	Add better errors reporting for ActiveModel::Configuration	Oscar Del Ben	2012-04-04	1	-3/+3
* \| \| \|	Merge pull request #5720 from kennyj/should_use_klass_method	Jon Leighton	2012-04-11	2	-1/+2
\|\ \ \ \
\| * \| \| \|	Get a properly aliased_table_name, when we use a polymorphic association.	kennyj	2012-04-04	2	-1/+2
* \| \| \| \|	Merge pull request #5809 from xuanxu/null_relation_methods	Jon Leighton	2012-04-11	2	-0/+86
\|\ \ \ \ \
\| * \| \| \| \|	Override AR::Relation methods in NullRelation.	Juanjo Bazán	2012-04-11	2	-0/+86
* \| \| \| \| \|	Merge pull request #5792 from lest/patch-4	Xavier Noria	2012-04-11	1	-2/+2
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \|
\| * \| \| \| \|	no need in temporary array in number_to_phone helper	Sergey Nartimov	2012-04-09	1	-2/+2
* \| \| \| \| \|	Merge pull request #5805 from dcurtis/master	Xavier Noria	2012-04-11	2	-2/+2
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Corrected grammatical errors in schema_dumper and scoping/default	dcurtis	2012-04-10	2	-2/+2
\|/ / / / / /
* \| \| \| \| \|	Merge pull request #5649 from rafaelfranca/fix-delete_all	Aaron Patterson	2012-04-10	4	-17/+59
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \|
\| * \| \| \| \|	Fix delete_all when chained with joins.	Rafael Mendonça França	2012-04-10	4	-17/+59
\|/ / / / /
* \| \| \| \|	Merge pull request #5788 from Ask11/rails_new_help	Santiago Pastorino	2012-04-09	2	-3/+17
\|\ \ \ \ \
\| * \| \| \| \|	"rails new -h" shows message in rails directory	ask	2012-04-09	2	-3/+17
* \| \| \| \| \|	Merge pull request #5787 from frankieroberto/itemscope-patch	Santiago Pastorino	2012-04-09	2	-3/+3
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Adding itemscope to list of boolean attributes.	Frankie Roberto	2012-04-09	2	-3/+3
\| \|/ / / / /
* / / / / /	rewords the section about default_url_options in the Action Controller Overvi...	Xavier Noria	2012-04-09	1	-3/+4
\|/ / / / /
* \| \| \| \|	Merge pull request #5783 from rafaelfranca/default_url_options	Santiago Pastorino	2012-04-08	3	-4/+4
\|\ \ \ \ \