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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge branch 'master' of github.com:lifo/docrails	Vijay Dev	2012-06-22	16	-151/+340
\|\
\| *	fixes a few mistakes in api docs [ci skip]	Vijay Dev	2012-06-22	6	-9/+7
\| *	copy edit the assets guide[ci skip]	Vijay Dev	2012-06-22	1	-17/+6
\| *	update ActiveModel::Callbacks documentation [ci skip]	Francesco Rodriguez	2012-06-22	1	-24/+26
\| *	add description to ActiveModel::MissingAttributeError [ci skip]	Francesco Rodriguez	2012-06-21	1	-1/+2
\| *	add example to ActiveModel::AttributeMethods#undefine_attribute_methods [ci s...	Francesco Rodriguez	2012-06-21	1	-0/+26
\| *	add docs to AM::AttributeMethods#define_attribute_method [ci skip]	Francesco Rodriguez	2012-06-21	1	-0/+25
\| *	fix ActiveModel::AttributeMethods#alias_attribute documentation [ci skip]	Francesco Rodriguez	2012-06-21	1	-7/+20
\| *	update ActiveModel::AttributeMethods documentation [ci skip]	Francesco Rodriguez	2012-06-21	1	-27/+20
\| *	Small typo in Backporting instructions.	Godfrey Chan	2012-06-21	1	-1/+1
\| *	just specify what's to be done, not what's not to be.	Damien Mathieu	2012-06-20	1	-1/+1
\| *	Fix delivery_method usage	Ben Oakes	2012-06-20	1	-1/+1
\| *	switch to prototype also modifies application.js [ci skip]	Francesco Rodriguez	2012-06-20	1	-1/+9
\| *	remove deprecated methods [ci skip]	Francesco Rodriguez	2012-06-19	1	-17/+0
\| *	update Built-in Rails Helpers section [ci skip]	Francesco Rodriguez	2012-06-19	1	-16/+38
\| *	fix typo [ci skip]	Francesco Rodriguez	2012-06-19	1	-7/+7
\| *	add documentation to AS::TestCase#assert_nothing_raised	Francesco Rodriguez	2012-06-19	1	-0/+5
\| *	update AS::Testing::Assertions docs	Francesco Rodriguez	2012-06-19	1	-21/+32
\| *	fix typo [ci skip]	Francesco Rodriguez	2012-06-19	1	-2/+2
\| *	Typo in documentation.	Andrés Mejía	2012-06-19	1	-1/+1
\| *	add example to AS::Deprecation#deprecate_methods [ci skip]	Francesco Rodriguez	2012-06-18	1	-0/+20
\| *	Fix misprint in UrlHelper module	Alexey Vakhov	2012-06-18	1	-1/+1
\| *	Rewrite some parts of the Rails initialization guide	Oscar Del Ben	2012-06-17	1	-9/+4
\| *	Add initialization section	Oscar Del Ben	2012-06-17	1	-0/+5
\| *	Rewrite rails command section	Oscar Del Ben	2012-06-17	1	-2/+2
\| *	Add tip for browsing source code on Github	Oscar Del Ben	2012-06-17	1	-0/+5
\| *	Not focusing on Passenger for now	Oscar Del Ben	2012-06-17	1	-2/+4
\| *	add example to AS::Deprecation#silence [ci skip]	Francesco Rodriguez	2012-06-17	1	-1/+10
\| *	change not valid syntax [ci-skip]	Francesco Rodriguez	2012-06-16	1	-1/+1
\| *	fix example with data: { disable-with: '' } [ci skip]	Francesco Rodriguez	2012-06-16	1	-1/+1
\| *	update DOM and HTML vs AJAX communication [ci skip]	Gustavo Beathyate	2012-06-16	1	-2/+12
\| *	unnecessary reference to link_to_remote method in rails 4.0 [ci skip]	Francesco Rodriguez	2012-06-16	1	-23/+30
\| *	Add documentation for ActiveRecord::QueryMethods#reverse_order [ci skip]	Florent Guilleux	2012-06-16	1	-0/+3
\| *	Add documentation for ActiveRecord::QueryMethods#offset [ci skip]	Ulises Cabanillas	2012-06-16	1	-0/+7
\| *	update AJAX guide intro [ci skip]	Gustavo Beathyate	2012-06-16	1	-2/+14
\| *	Add documentation for ActiveRecord::QueryMethods#limit [ci skip]	Florent Guilleux	2012-06-16	1	-3/+7
\| *	Extend assets cache store section in Assets Pipeline Guide [ci skip]	Andrey Vakarev	2012-06-16	1	-3/+18
\| *	Add rdoc to phone_field	Gaurish Sharma	2012-06-16	1	-0/+1
\| *	add example to ActiveModel::Validations#validators [ci skip]	Francesco Rodriguez	2012-06-15	2	-3/+15
\| *	included another upgrading pinfall - accidentally having duplicate js files	Casey Watts	2012-06-15	1	-2/+8
* \|	Merge pull request #6800 from mschneider/dynamic_finders_for_aliased_attributes	Rafael Mendonça França	2012-06-22	7	-2/+27
\|\ \
\| * \|	made dynamic finders alias_attribute aware	Maximilian Schneider	2012-06-22	7	-2/+27
* \| \|	Fix changelog typo [ci skip]	Carlos Antonio da Silva	2012-06-22	1	-1/+1
* \| \|	Merge branch 'pluck-multiple-columns'	Carlos Antonio da Silva	2012-06-22	4	-28/+76
\|\ \ \
\| * \| \|	Add changelog entry and guide updates for pluck with multiple columns	Carlos Antonio da Silva	2012-06-22	3	-6/+26
\| * \| \|	Refactor pluck with multiple columns	Carlos Antonio da Silva	2012-06-22	2	-36/+29
\| * \| \|	ActiveRecord#pluck now accepts multiple columns	jeroeningen	2012-06-22	2	-16/+51
\|/ / /
* \| \|	Fix serializable_hash with xml generation and default :except option	Carlos Antonio da Silva	2012-06-22	3	-5/+30
* \| \|	Add some coverage for AR serialization with serializable_hash	Carlos Antonio da Silva	2012-06-22	4	-27/+114
* \| \|	disallow mutating a relation once loaded	Jon Leighton	2012-06-22	3	-18/+50