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

	Commit message (Expand)	Author	Age	Files	Lines
...
* \|	Removes the restriction on primary key when joining in a habtm && test that i...	Mohammad El-Abid	2011-05-26	1	-4/+0
\|/
*	Merge branch 'master' of github.com:rails/rails	Xavier Noria	2011-05-25	2	-37/+0
\|\
\| *	removed deprecated methods, and related tests, from ActiveRecord	Josh Kalderimis	2011-05-25	2	-37/+0
* \|	Merge branch 'master' of git://github.com/lifo/docrails	Xavier Noria	2011-05-25	2	-2/+2
\|\ \ \| \|/ \|/\|
\| *	Remove extra white spaces on ActiveRecord docs.	Sebastian Martinez	2011-05-23	2	-2/+2
* \|	Ignore :includes on through associations	Andrew White	2011-05-24	1	-1/+1
* \|	Fix problem with loading polymorphic associations which have been defined in ...	Jon Leighton	2011-05-22	2	-8/+22
* \|	Handle polymorphic_type NOT NULL-able columns as well.	thedarkone	2011-05-21	1	-1/+1
* \|	AliasTracker.pluralize use pluralize_table_names of model	Guillermo Iguaran	2011-05-20	2	-3/+3
* \|	Implement proxy_owner, proxy_target and proxy_reflection methods on Collectio...	Jon Leighton	2011-05-19	1	-0/+24
\|/
*	Don't pass a block as we are yielding	Andrew White	2011-05-17	1	-1/+1
*	Add block setting of attributes to singular associations	Andrew White	2011-05-17	2	-11/+12
*	Pass the attribute and option hashes to build_association	Andrew White	2011-05-17	2	-8/+12
*	Merge pull request #560 from guilleiguaran/fix_pluralize_table_names_false	Jon Leighton	2011-05-16	1	-1/+1
\|\
\| *	Fixing has_many association when ActiveRecord::Base.pluralize_table_names is ...	Guillermo Iguaran	2011-05-15	1	-1/+1
* \|	These extra array operations appear to be unnecessary. Reasoning:	Jon Leighton	2011-05-14	1	-8/+2
* \|	CollectionAssociation#merge_target_lists should write to the underlying attri...	Jon Leighton	2011-05-14	1	-5/+2
* \|	An attempt to make CollectionAssociation#merge_target_lists make more sense.	Jon Leighton	2011-05-14	1	-16/+35
\|/
*	Instead of doing find(:all) which does scoped.find(:all) which does scoped.al...	Jon Leighton	2011-05-13	1	-1/+1
*	Remove pointless rescue (it doesn't happen anywhere in the tests, and I can't...	Jon Leighton	2011-05-13	1	-9/+1
*	Don't use mass-assignment protection when setting foreign keys or association...	Jon Leighton	2011-05-12	1	-9/+9
*	Don't remove the target if it has already been destroyed	Andrew White	2011-05-11	1	-1/+1
*	Modified CollectionAssociation to refer to the new class name.	Michael Ebens	2011-05-11	1	-1/+1
*	Don't use select() values from the join model of a through association. Fixes...	Jon Leighton	2011-05-11	1	-3/+4
*	Bring back obj.association_loaded? as a deprecated method. Fixes #472.	Jon Leighton	2011-05-11	1	-0/+13
*	Remove unnecessary '\|\| {}'	Jon Leighton	2011-05-10	1	-1/+1
*	Don't use mass-assignment protection when applying the scoped.scope_for_creat...	Jon Leighton	2011-05-10	2	-3/+7
*	Fix #480. Passing nil to create association works.	José Valim	2011-05-10	1	-1/+1
*	Revert "b9ea751d0e56bd00d341766977a607ed3f7ddd0f".	José Valim	2011-05-10	1	-26/+27
*	Merge pull request #399 from ernie/join_conditions_on_join	Jon Leighton	2011-05-05	1	-3/+3
\|\
\| *	Add join conditions to JOIN clause, not WHERE	Ernie Miller	2011-05-05	1	-3/+3
* \|	Merge pull request #358 from baroquebobcat/fix_find_or_create_master	Aaron Patterson	2011-05-05	1	-3/+6
\|\ \ \| \|/ \|/\|
\| *	Fix for lighthouse #6741	Nick Howard	2011-05-01	1	-3/+6
* \|	singular and collection relations in AR can now specify mass-assignment secur...	Josh Kalderimis	2011-05-01	3	-20/+20
\|/
*	Extract the constraint-building for joins in JoinAssociation into a separate ...	Jon Leighton	2011-04-14	1	-8/+14
*	Remove `#among?` from Active Support	Prem Sichanugrist	2011-04-13	5	-5/+5
*	Removing the scope-caching which happens on association proxies, because the ...	Jon Leighton	2011-04-12	2	-14/+0
*	Change Object#either? to Object#among? -- thanks to @jamesarosen for the sugg...	David Heinemeier Hansson	2011-04-12	5	-5/+5
*	Using Object#in? and Object#either? in various places	Prem Sichanugrist	2011-04-11	5	-5/+14
*	TableAlias leg ordering has changed, so change accordingly	Aaron Patterson	2011-03-30	1	-1/+1
*	Make clearing of HABTM join table contents happen in an after_destory callback.	Murray Steele	2011-03-23	1	-12/+12
*	Merge branch 'master' into nested_has_many_through	Jon Leighton	2011-03-16	1	-1/+1
\|\
\| *	Add additional text to NotImplementedErrors [#6328 state:resolved]	Mike Gehard	2011-03-12	1	-1/+1
* \|	Fix tests under postgres - we should always put conditions in the WHERE part ...	Jon Leighton	2011-03-12	3	-18/+22
* \|	Resolve some TODO comments which I decided did not need anything done	Jon Leighton	2011-03-12	2	-8/+5
* \|	Abstract some common code from AssociationScope and JoinDependency::JoinAssoc...	Jon Leighton	2011-03-11	3	-97/+82
* \|	Refactor JoinAssociation	Jon Leighton	2011-03-10	1	-100/+54
* \|	Rename Reflection#through_reflection_chain and #through_options to Reflection...	Jon Leighton	2011-03-10	3	-18/+15
* \|	Move the code which builds a scope for through associations into a generic As...	Jon Leighton	2011-03-10	7	-209/+155
* \|	Fix test_has_many_association_through_a_has_many_association_with_nonstandard...	Jon Leighton	2011-03-07	1	-1/+1