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

Conflicts:
	activerecord/lib/active_record/migration.rb

2009-08-10 10:40:11 -03:00

..

associations

Merge commit 'rails/master'

2009-08-10 10:40:11 -03:00

attribute_methods

Ruby 1.9.2: Object#id is gone now

2009-08-07 16:41:04 -07:00

connection_adapters

Merge commit 'rails/master'

2009-08-06 18:57:47 -03:00

locale

Merge docrails

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

locking

Performance: cache/reload arel relation when possible to speed up things.

2009-07-21 23:01:26 -03:00

serializers

Patch to ActiveModel's (and ActiveRecord, by association) XML serialization: If two parameters are present in Procs supplied to to_xml's :procs option, the model being serialized will be passed as the second argument [#2373 state:resolved]

2009-07-22 20:47:15 -05:00

validations

Move validate_on_create and validate_on_update from ActiveModel to ActiveRecord

2009-03-21 01:11:38 +00:00

aggregations.rb

Break up DependencyModule's dual function of providing a "depend_on" DSL and "included" block DSL into separate modules. But, unify both approaches under AS::Concern.

2009-05-28 11:35:36 -05:00

association_preload.rb

Merge docrails

2009-07-25 16:03:58 +01:00

associations.rb

Removed unused methods.

2009-08-07 17:55:36 -03:00

attribute_methods.rb

Extract generic attribute method generation to AMo

2009-08-04 23:36:05 -05:00

autosave_association.rb

Add primary_key option to belongs_to association

2009-07-15 18:13:32 -07:00

base.rb

Merge commit 'rails/master'

2009-08-08 19:14:35 -03:00

batches.rb

Break up DependencyModule's dual function of providing a "depend_on" DSL and "included" block DSL into separate modules. But, unify both approaches under AS::Concern.

2009-05-28 11:35:36 -05:00

calculations.rb

Don't scope order in calculations.'

2009-08-07 14:33:35 -03:00

callbacks.rb

Merge docrails

2009-07-25 16:03:58 +01: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

Merge docrails

2009-07-25 16:03:58 +01:00

migration.rb

Merge commit 'rails/master'

2009-08-10 10:40:11 -03:00

named_scope.rb

Revert "Methods invoked within named scope Procs should respect the scope stack. [#1267 state:resolved]"

2009-07-29 16:54:54 -07:00

nested_attributes.rb

Merge docrails

2009-07-25 16:03:58 +01:00

observer.rb

Integrate ActiveModel::Observing into ActiveRecord

2009-06-10 23:36:44 -05:00

query_cache.rb

ActiveRecord::QueryCache middleware

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

reflection.rb

Break up DependencyModule's dual function of providing a "depend_on" DSL and "included" block DSL into separate modules. But, unify both approaches under AS::Concern.

2009-05-28 11:35:36 -05:00

relation.rb

Added collection iteration to AR::Relation.

2009-08-03 14:15:47 -03:00

schema_dumper.rb

Add support for dumping non-standard primary keys when using the SQLite3 adapter. Fix unit tests so that this feature is tested for all adapters. [#2868 state:resolved]

2009-07-07 16:17:25 -07:00

schema.rb

Merge docrails.

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

serialization.rb

Integrate AMo JSON serializer into AR

2009-07-03 23:12:42 -05:00

session_store.rb

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

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

state_machine.rb

Add simple support for ActiveModel's StateMachine for ActiveRecord

2009-08-04 11:03:57 -05:00

test_case.rb

Calculations now use Arel to construct the query.

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

timestamp.rb

Break up DependencyModule's dual function of providing a "depend_on" DSL and "included" block DSL into separate modules. But, unify both approaches under AS::Concern.

2009-05-28 11:35:36 -05:00

transactions.rb

Break up DependencyModule's dual function of providing a "depend_on" DSL and "included" block DSL into separate modules. But, unify both approaches under AS::Concern.

2009-05-28 11:35:36 -05:00

validations.rb

Merge docrails

2009-07-25 16:03:58 +01:00

version.rb

Bump up the version to 3.0.pre

2009-06-30 14:37:12 -07:00