Pratik Naik b04230e3bb Merge remote branch 'mainstream/master' ...

Conflicts:
	actionpack/lib/action_controller/metal/flash.rb

2010-01-17 03:20:30 +05:30

..

associations

Make type_condition return Arel predicate and not a string condition

2010-01-16 04:21:18 +05:30

attribute_methods

Object#tap is not needed for Ruby >= 1.8.7

2009-11-09 22:16:51 +01:00

attributes

Fixed: #without_typecast should only disable typecasting on the duplicated attributes [#3387 state:resolved]

2009-10-18 10:22:22 -05:00

connection_adapters

Revert "Fix #microseconds conversion and #fast_string_to_time"

2010-01-17 03:04:11 +05:30

locale

Allow to specify default attributes names translation in I18n yml files.

2010-01-07 15:31:50 +01:00

locking

Rename Model.active_relation to Model.unscoped

2010-01-17 03:00:56 +05:30

railties

Do not send the whole controller in notifications, cherry pick required pieces.

2010-01-15 12:24:31 +01:00

relation

Rename Model.active_relation to Model.unscoped

2010-01-17 03:00:56 +05:30

serializers

Break up concerns for choosing what attributes should be serialized and the actual serializer

2009-08-13 22:27:36 -05:00

types

Refactoring attributes/types [#3348 state:resolved]

2009-10-17 12:37:15 -05:00

validations

Rename Model.active_relation to Model.unscoped

2010-01-17 03:00:56 +05:30

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

Use new finder methods for association preloading

2010-01-16 22:14:10 +05:30

associations.rb

Merge remote branch 'mainstream/master'

2010-01-17 03:20:30 +05:30

attribute_methods.rb

No need to check for generated method, just redispatch

2009-11-14 01:51:52 -08:00

attributes.rb

Refactoring attributes/types [#3348 state:resolved]

2009-10-17 12:37:15 -05:00

autosave_association.rb

Different nested validations should not be ignore [#3638 status:resolved]

2010-01-14 01:46:27 +01:00

base.rb

Merge remote branch 'mainstream/master'

2010-01-17 03:20:30 +05:30

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

Rename Model.active_relation to Model.unscoped

2010-01-17 03:00:56 +05:30

callbacks.rb

Ensure before_validation and after_validation accepts :on as option.

2010-01-06 22:24:16 +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 remote branch 'mainstream/master'

2010-01-17 03:20:30 +05:30

migration.rb

Merge remote branch 'mainstream/master'

2010-01-17 03:20:30 +05:30

named_scope.rb

Rename Model.active_relation to Model.unscoped

2010-01-17 03:00:56 +05:30

nested_attributes.rb

Merge remote branch 'mainstream/master'

2010-01-17 03:20:30 +05:30

observer.rb

Changed ActiveRecord to use new callbacks and speed up observers by only notifying events that are actually being consumed.

2009-09-08 10:26:39 -05:00

query_cache.rb

ActiveRecord::QueryCache middleware

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

railtie.rb

Move Dispatcher setup to Railties and add instrumentation hook.

2010-01-15 12:24:30 +01:00

reflection.rb

Renamed AssociationReflection #collection_association? to #collection?.

2010-01-08 21:47:17 +01:00

relation.rb

Remove AR#scope() method

2010-01-16 01:42:01 +05:30

schema_dumper.rb

Don't define a default primary key in the schema dumper.

2009-08-08 19:31:35 -07:00

schema.rb

Allow AR::Schema's migrations_path to be overwritten by subclasses. Defaults to 'db/migrate'

2010-01-08 13:08:23 -08:00

serialization.rb

Break up concerns for choosing what attributes should be serialized and the actual serializer

2009-08-13 22:27:36 -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

Autoload AS test case

2010-01-04 16:22:46 -06: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

types.rb

Refactoring attributes/types [#3348 state:resolved]

2009-10-17 12:37:15 -05:00

validations.rb

Errors messages are now moved from :activerecord.errors to simply :errors on I18n yml files.

2010-01-07 15:31:49 +01:00

version.rb

Bump up the version to 3.0.pre

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