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

	Commit message (Expand)	Author	Age	Files	Lines
*	Fix has_many assocation w/select load after create	Ernie Miller	2012-10-05	1	-1/+1
*	Revert "Use flat_map { } instead of map {}.flatten"	Santiago Pastorino	2012-10-05	3	-4/+4
*	Use flat_map { } instead of map {}.flatten	Santiago Pastorino	2012-10-05	3	-4/+4
*	Count returns 0 without querying if parent is not saved	Francesco Rodriguez	2012-10-03	1	-0/+2
*	Merge branch 'master' of github.com:lifo/docrails	Vijay Dev	2012-09-28	1	-24/+8
\|\
\| *	fix AR::Associations::CollectionProxy#delete broken documentation [ci skip]	Francesco Rodriguez	2012-09-21	1	-23/+2
\| *	update AR::Associations::CollectionProxy#loaded? documentation [ci skip]	Francesco Rodriguez	2012-09-21	1	-1/+6
* \|	Fix destructive side effects from marshaling an association caused by 65843e1...	Jeremy Kemper	2012-09-25	1	-5/+2
\|/
*	Merge pull request #7251 from rails/integrate-strong_parameters	David Heinemeier Hansson	2012-09-18	5	-30/+29
\|\
\| *	Remove mass_assignment_options from ActiveRecord	Guillermo Iguaran	2012-09-16	5	-29/+29
\| *	Remove mass assignment security from ActiveRecord	Guillermo Iguaran	2012-09-16	1	-1/+0
* \|	Merge pull request #7661 from ernie/build-join-records-on-unsaved-hmt	Rafael Mendonça França	2012-09-17	1	-0/+14
\|\ \ \| \|/ \|/\|
\| *	Fix collection= on hm:t join models when unsaved	Ernie Miller	2012-09-17	1	-0/+14
* \|	Remove debug code :bomb:	Rafael Mendonça França	2012-09-16	1	-1/+0
* \|	Don't preserve SELECT columns on COUNT	Steve Klabnik	2012-09-16	1	-1/+2
\|/
*	Update documentation for CollectionProxy	Marc-Andre Lafortune	2012-09-12	1	-8/+2
*	Merge pull request #4976 from kreynolds/fix_eager_without_pkey	Jon Leighton	2012-09-07	1	-1/+1
\|\
\| *	Fix eagerly loading associations without primary keys	Kelley Reynolds	2012-02-09	1	-1/+1
* \|	Fix grammar	Jo Liss	2012-08-30	1	-3/+3
* \|	Use inversed parent for first and last child of has_many association	brainopia	2012-08-18	1	-1/+1
* \|	Use method compilation for association methods	Jon Leighton	2012-08-10	5	-64/+62
* \|	DRY up handling of dependent option	Jon Leighton	2012-08-10	5	-63/+22
* \|	Unprivatise all the things	Jon Leighton	2012-08-10	7	-170/+156
* \|	move dependency logic out of generated methods	Jon Leighton	2012-08-10	7	-65/+64
* \|	Clean up dependent option validation.	Jon Leighton	2012-08-10	4	-14/+7
* \|	Remove the dependent_restrict_raises option.	Jon Leighton	2012-08-10	3	-23/+22
* \|	Fix #7191. Remove unnecessary transaction when assigning has_one associations.	kennyj	2012-08-08	1	-13/+15
* \|	removes usage of Object#in? from the code base (the method remains defined by...	Xavier Noria	2012-08-06	2	-10/+13
* \|	Changing AR:CollectionAssociation#empty? to use #exists?	beerlington	2012-08-05	1	-3/+11
* \|	load active_support/deprecation in active_support/rails	Xavier Noria	2012-08-02	2	-2/+0
* \|	load active_support/core_ext/object/inclusion in active_support/rails	Xavier Noria	2012-08-02	5	-5/+0
* \|	load active_support/core_ext/object/blank in active_support/rails	Xavier Noria	2012-08-02	1	-1/+0
* \|	s/scoped/scope/	Jon Leighton	2012-08-01	7	-25/+31
* \|	Add CollectionProxy#scope	Jon Leighton	2012-08-01	1	-1/+5
* \|	Use explicit delegations	Jon Leighton	2012-08-01	1	-119/+79
* \|	Deprecate :finder_sql, :counter_sql, :insert_sql, :delete_sql.	Jon Leighton	2012-08-01	3	-1/+22
* \|	Revert "Remove :finder_sql, :counter_sql, :insert_sql, :delete_sql."	Jon Leighton	2012-08-01	7	-35/+111
* \|	Refactor dependency check validation	Carlos Antonio da Silva	2012-08-01	4	-28/+19
* \|	move method for dependent option check	Hrvoje Šimić	2012-08-01	4	-11/+22
* \|	fix typo in collection proxy	Accessd	2012-07-31	1	-1/+1
* \|	Deprecate Relation#all.	Jon Leighton	2012-07-27	1	-1/+1
* \|	Deprecate ActiveRecord::Base.scoped.	Jon Leighton	2012-07-27	3	-7/+3
* \|	Deprecate update_column in favor of update_columns.	Rafael Mendonça França	2012-07-24	1	-1/+1
* \|	we don't need this arg	Jon Leighton	2012-07-20	1	-2/+2
* \|	Remove :finder_sql, :counter_sql, :insert_sql, :delete_sql.	Jon Leighton	2012-07-20	7	-111/+35
* \|	Remove obsolete line.	Jon Leighton	2012-07-20	1	-1/+0
* \|	Convert association macros to the new syntax	Jon Leighton	2012-07-20	1	-1/+1
* \|	Avoid options ever being nil	Jon Leighton	2012-07-20	1	-4/+4
* \|	fix association :extend option	Jon Leighton	2012-07-13	3	-12/+19
* \|	move the deprecated options into active_record_deprecated_finders	Jon Leighton	2012-07-13	2	-5/+2