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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge branch 'master' into adequaterecord	Aaron Patterson	2014-04-14	104	-581/+1465
\|\
\| *	Merge pull request #14735 from byroot/idempotent-counter-caches	Aaron Patterson	2014-04-14	3	-4/+47
\| \|\
\| \| *	Make counter cache decrementation on destroy idempotent	Jean Boussier	2014-04-13	2	-4/+26
\| \| *	Write the failing test case for concurrent counter cache	Jean Boussier	2014-04-13	1	-0/+21
\| * \|	Merge pull request #14746 from zenati/master	Yves Senn	2014-04-14	1	-1/+1
\| \|\ \
\| \| * \|	[ci skip] Added link to ruby-lang.org installation.	ZENATI YASSINE	2014-04-14	1	-1/+1
\| * \| \|	Use the index on hidden field	Rafael Mendonça França	2014-04-14	1	-1/+1
\| * \| \|	Merge pull request #14736 from nashby/hidden-index	Rafael Mendonça França	2014-04-14	3	-4/+26
\| \|\ \ \ \| \| \|/ / \| \|/\| \|
\| \| * \|	`collection_check_boxes` respects `:index` option for the hidden filed name.	Vasiliy Ermolovich	2014-04-14	3	-4/+26
\| \| \|/
\| * \|	docs, double meaning of `serialize` argument. Closes #14284.	Yves Senn	2014-04-14	1	-5/+16
\| * \|	Merge pull request #14739 from oysta/guide-fixes	Yves Senn	2014-04-14	1	-2/+2
\| \|\ \
\| \| * \|	- Fix lingering reference to `:text` instead of the newer `:plain`	Christopher Owen	2014-04-14	1	-2/+2
\| * \| \|	Merge pull request #14740 from laurocaetano/read-attribute	Rafael Mendonça França	2014-04-14	2	-7/+7
\| \|\ \ \ \| \| \|/ / \| \|/\| \|
\| \| * \|	Just call read_attribute, no need to use `send`.	Lauro Caetano	2014-04-14	2	-7/+7
\| \|/ /
\| * \|	again, read_attribute is public, so just call it	Aaron Patterson	2014-04-13	1	-1/+1
\| * \|	read_attribute is public, so we should just call it	Aaron Patterson	2014-04-13	1	-1/+1
\| * \|	Merge pull request #14737 from nickborromeo/disable-asset-cache-docs	Arthur Nogueira Neves	2014-04-13	1	-0/+8
\| \|\ \
\| \| * \|	Disable assest cache store in docs [ci skip]	Nick Borromeo	2014-04-13	1	-0/+8
\| \|/ /
\| * \|	Merge pull request #14732 from JuanitoFatas/doc/patch1	Robin Dupret	2014-04-13	4	-5/+5
\| \|\ \ \| \| \|/ \| \|/\|
\| \| *	[ci skip] Use plain underscore instead of "\_".	Juanito Fatas	2014-04-13	4	-5/+5
\| \|/
\| *	Merge pull request #14592 from laurocaetano/equality_between_relation_and_col...	Rafael Mendonça França	2014-04-13	4	-0/+54
\| \|\
\| \| *	Ensure that the comparison between 'CollectionProxy' and 'AssociationRelation...	Lauro Caetano	2014-04-12	1	-0/+9
\| \| *	Make the comparison between 'Relation' and 'AssociationRelation'	Lauro Caetano	2014-04-12	3	-1/+14
\| \| *	The comparison between `Relation` and `CollectionProxy` should be consistent.	Lauro Caetano	2014-04-11	3	-0/+32
\| * \|	Merge pull request #14726 from akshay-vishnoi/structural-change	Rafael Mendonça França	2014-04-13	2	-0/+0
\| \|\ \
\| \| * \|	Move tests for deep_dup and duplicable to object directory	Akshay Vishnoi	2014-04-13	2	-0/+0
\| * \| \|	Merge pull request #14722 from maurogeorge/mg-readonly-collection	Santiago Pastorino	2014-04-13	2	-1/+45
\| \|\ \ \
\| \| * \| \|	CollectionHelpers now accepts a readonly option	Mauro George	2014-04-12	2	-1/+45
\| * \| \| \|	Merge pull request #14718 from mcmorgan/update-documentation-to-match-generat...	Santiago Pastorino	2014-04-13	18	-25/+24
\| \|\ \ \ \
\| \| * \| \| \|	Update documentation to use Rails.application instead	Marcel Morgan	2014-04-13	18	-25/+24
\| \| \| \|/ / \| \| \|/\| \|
\| * \| \| \|	Merge pull request #14727 from robin850/patch-17	Yves Senn	2014-04-13	1	-0/+14
\| \|\ \ \ \ \| \| \|/ / / \| \|/\| \| \|
\| \| * \| \|	Add a changelog entry for #14546 [ci skip]	Robin Dupret	2014-04-13	1	-0/+14
\| \|/ / /
\| * \| \|	Merge pull request #14725 from afshinator/patch-1	Richard Schneeman	2014-04-12	1	-1/+1
\| \|\ \ \
\| \| * \| \|	Missing 'are' in note - [ci skip]	Afshin Mokhtari	2014-04-12	1	-1/+1
\| \|/ / /
\| * \| \|	Fix a few typos [ci skip]	Robin Dupret	2014-04-12	1	-13/+13
\| * \| \|	Merge pull request #14720 from philr/tzinfo_data_x64_mingw	Rafael Mendonça França	2014-04-12	1	-1/+1
\| \|\ \ \
\| \| * \| \|	Bundle tzinfo-data on :x64_mingw (64-bit Ruby on Windows).	Phil Ross	2014-04-12	1	-1/+1
\| \|/ / /
\| * \| \|	don't bother with an offset if the offset is zero	Aaron Patterson	2014-04-12	1	-6/+9
\| * \| \|	only add the offset and index when we need to	Aaron Patterson	2014-04-12	1	-8/+9
\| * \| \|	remove branching logic from calls to find_nth	Aaron Patterson	2014-04-12	1	-6/+10
\| \|/ /
\| * \|	Merge pull request #14717 from vipulnsward/change-37signal-links	Robin Dupret	2014-04-12	3	-4/+4
\| \|\ \
\| \| * \|	Change links to 37signals and svn blog to point to new destinations. [ci skip]	Vipul A M	2014-04-12	3	-4/+4
\| \|/ /
\| * /	please use Ruby, not ActiveSupport	Aaron Patterson	2014-04-11	1	-1/+1
\| \|/
\| *	Merge branch 'rm-fix-13648'	Rafael Mendonça França	2014-04-11	5	-3/+35
\| \|\
\| \| *	Use assert_not	Rafael Mendonça França	2014-04-11	1	-1/+1
\| \| *	New CHANGELOG entries are in to top of file	Rafael Mendonça França	2014-04-11	1	-7/+7
\| \| *	:scissors:	Rafael Mendonça França	2014-04-11	3	-7/+7
\| \| *	Merge pull request #14711 from swoker/activerecord_fix_aggregate_methods_with...	Rafael Mendonça França	2014-04-11	5	-3/+35
\| \|/\|
\| \| *	fix exception on polymorphic associations with predicates	Simon Woker	2014-04-11	2	-0/+16
\| \| *	Fix error for aggregate methods with select, see issue #13648	Simon Woker	2014-04-10	3	-3/+19