Emilio Tagua a04dedd563 Merge commit 'rails/master' ...

Conflicts:

	activerecord/lib/active_record/base.rb
	activerecord/lib/active_record/migration.rb
	activerecord/test/cases/helper.rb

2009-05-18 11:18:46 -03:00

..

associations

Implement #many? for NamedScope and AssociationCollection using #size [#1500 state:resolved]

2009-05-17 18:56:06 +02:00

connection_adapters

Merge commit 'rails/master'

2009-05-18 11:18:46 -03:00

locale

Merge docrails

2009-01-18 18:10:58 +00:00

locking

Merge commit 'rails/master'

2009-05-12 16:13:00 -03:00

serializers

Cherry-pick core extensions

2009-05-13 12:00:15 -07:00

aggregations.rb

Use DependencyModule for included hooks in ActiveRecord

2009-05-11 22:23:47 -04:00

association_preload.rb

Use DependencyModule for included hooks in ActiveRecord

2009-05-11 22:23:47 -04:00

associations.rb

Merge commit 'rails/master'

2009-05-18 11:18:46 -03:00

attribute_methods.rb

Merge commit 'origin/master'

2009-05-14 17:38:30 -07:00

autosave_association.rb

Use DependencyModule for included hooks in ActiveRecord

2009-05-11 22:23:47 -04:00

base.rb

Merge commit 'rails/master'

2009-05-18 11:18:46 -03:00

batches.rb

Use DependencyModule for included hooks in ActiveRecord

2009-05-11 22:23:47 -04:00

calculations.rb

Merge commit 'rails/master'

2009-05-12 16:13:00 -03:00

callbacks.rb

Use DependencyModule for included hooks in ActiveRecord

2009-05-11 22:23:47 -04:00

dirty.rb

Cherry-pick core extensions

2009-05-13 12:00:15 -07:00

dynamic_finder_match.rb

Dynamic finders should use the ActiveRecord::Base::find method instead of ::find_initial, :find_last, and ::find_all.

2008-10-03 21:28:11 +02:00

dynamic_scope_match.rb

Introduce dynamic scopes for ActiveRecord: you can now use class methods like scoped_by_user_name(user_name) and scoped_by_user_name_and_password(user_name, password) that will use the scoped method with attributes you supply. [#1648 state:committed]

2008-12-28 20:52:46 +01:00

fixtures.rb

Cherry-pick core extensions

2009-05-13 12:00:15 -07:00

migration.rb

Merge commit 'rails/master'

2009-05-18 11:18:46 -03:00

named_scope.rb

Implement #many? for NamedScope and AssociationCollection using #size [#1500 state:resolved]

2009-05-17 18:56:06 +02:00

nested_attributes.rb

Cherry-pick core extensions

2009-05-13 12:00:15 -07:00

observer.rb

Use DependencyModule for included hooks in ActiveRecord

2009-05-11 22:23:47 -04:00

query_cache.rb

ActiveRecord::QueryCache middleware

2008-12-22 11:31:18 -06:00

reflection.rb

Use DependencyModule for included hooks in ActiveRecord

2009-05-11 22:23:47 -04:00

schema_dumper.rb

Cherry-pick core extensions

2009-05-13 12:00:15 -07:00

schema.rb

Merge docrails.

2008-05-25 12:29:00 +01:00

serialization.rb

Cherry-pick core extensions

2009-05-13 12:00:15 -07:00

session_store.rb

Fix reset_session with ActiveRecord store [#2200 state:resolved]

2009-05-17 14:42:36 -05:00

test_case.rb

Calculations now use Arel to construct the query.

2009-04-29 19:39:53 -03:00

timestamp.rb

Use DependencyModule for included hooks in ActiveRecord

2009-05-11 22:23:47 -04:00

transactions.rb

Use DependencyModule for included hooks in ActiveRecord

2009-05-11 22:23:47 -04:00

validations.rb

Cherry-pick core extensions

2009-05-13 12:00:15 -07:00

version.rb

Prepare for final 2.3 release

2009-03-15 22:06:50 -05:00