Jon Leighton 28ed10d3f2 Merge branch 'master' into nested_has_many_through ...

Conflicts:
	activerecord/CHANGELOG

2011-03-05 22:58:48 +00:00

..

batches.rb

Fix Typos: remove several occurences of the the

2011-02-17 20:46:52 -05:00

calculations.rb

removing limits and offsets from COUNT queries unless both are specified. [#6268 state:resolved]

2011-02-25 15:38:59 -08:00

finder_methods.rb

Move JoinDependency and friends from ActiveRecord::Associations::ClassMethods to just ActiveRecord::Associations

2011-02-28 22:12:43 +00:00

predicate_builder.rb

use Arel::Table#alias rather than passing the :as parameter

2011-03-05 11:56:24 -08:00

query_methods.rb

Merge branch 'master' into nested_has_many_through

2011-03-04 09:30:27 +00:00

spawn_methods.rb

Remove Relation#& alias for Relation#merge

2011-02-12 17:23:19 -08:00