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

	Commit message (Expand)	Author	Age	Files	Lines
*	let's keep the slash in the return value instead of the path variable [ci skip]	Vijay Dev	2012-04-18	1	-2/+2
*	Fix confusing example in ActiveModel::Errors	Thibaut Courouble	2012-04-17	1	-2/+2
*	Warn about do end syntax in redirect option	Oscar Del Ben	2012-04-17	1	-0/+3
*	Fix redirect with block example	Alexey Vakhov	2012-04-17	1	-3/+3
*	Fix example in flash middleware	Alexey Vakhov	2012-04-17	1	-1/+1
*	Fix typo where a table name in a join was singular.	Don Petersen	2012-04-16	1	-1/+1
*	Fixed a typo in migrations	luke	2012-04-15	1	-1/+1
*	fix ActiveModel::Validations::Callbacks doc	Jan Xie	2012-04-15	1	-1/+2
*	fix bad format [ci skip]	Michael de Silva	2012-04-14	1	-7/+7
*	Improve example in initializer	Oscar Del Ben	2012-04-14	1	-1/+1
*	SQL query formatting	Bertrand Chardon	2012-04-13	1	-2/+7
*	Fix comment in AD http response	Alexey Vakhov	2012-04-13	1	-1/+1
*	Fix HTML sanitizer allowed_css_properties comment	Alexey Vakhov	2012-04-13	1	-1/+1
*	Revert "Added documentation to explain what happens if you don't set any valu...	Rodrigo Flores	2012-04-12	1	-5/+2
*	Added documentation to explain what happens if you don't set any values for t...	Rodrigo Flores	2012-04-12	1	-2/+5
*	Add documentation to detail passing of an object as the second	Michael de Silva	2012-04-13	1	-0/+27
*	Fix further typos in ActiveSupport::Notifications	Michael de Silva	2012-04-13	1	-4/+4
*	Fix rdoc typo in ActiveSupport::Notifications	Michael de Silva	2012-04-13	1	-1/+1
*	Fix typo on the add_index.	kennyj	2012-04-13	1	-1/+1
*	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