Yehuda Katz 3030bc90c9 Merge commit 'rails/3-0-unstable' ...

Conflicts:

	actionpack/lib/action_controller/base.rb
	actionpack/lib/action_dispatch/http/mime_type.rb
	actionpack/lib/action_dispatch/http/request.rb
	actionpack/lib/action_view/base.rb
	actionpack/lib/action_view/paths.rb
	actionpack/test/controller/session/cookie_store_test.rb
	actionpack/test/dispatch/rack_test.rb
	actionpack/test/dispatch/request_test.rb

2009-01-30 11:30:27 -08:00

..

associations

Cache columns for has_and_belongs_to_many associations

2009-01-17 18:09:13 +13:00

connection_adapters

Sqlite adapter's copy_table incorrectly attempts to recreate a primary key id (:id => true in the create_table) if an :id column is present, even if it isn't a primary_key.

2009-01-29 17:34:33 +13:00

locale

Merge docrails

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

locking

Partial updates don't update lock_version if nothing changed. [#426 state:resolved]

2008-06-22 20:33:43 -07:00

serializers

Added a :camelize option to ActiveRecord and Hash to_xml serialization and from_xml deserialization

2008-12-10 20:28:05 +01:00

aggregations.rb

Merge docrails

2008-10-05 22:16:26 +01:00

association_preload.rb

Fix :include of has_one with :primary_key option

2008-12-26 23:26:37 +00:00

associations.rb

Make belongs_to :dependent => :destroy destroy self before associated object [#1079 state:resolved]

2009-01-16 17:23:19 +00:00

attribute_methods.rb

"raise NoMethodError" raises NoMethodError. Raise it with NoMethodError.new instead.

2008-10-25 14:52:44 +05:30

base.rb

Ensure whitespaces are stripped when merging string joins. [#1297 state:resolved]

2009-01-28 19:50:55 +00:00

calculations.rb

Merge docrails

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

callbacks.rb

Merge docrails

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

dirty.rb

Fixing bug on ActiveRecord::Dirty#field_changed? for nullable numeric columns, NULL gets stored in database for blank (i.e. '') values. Only integer columns were considered.

2009-01-16 10:00:39 +13: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

Introduce transaction_joinable flag to mark that the fixtures transaction can't joined, a new savepoint is required even if :requires_new is not set. Use :requires_new option instead of :nest. Update changelog.

2009-01-10 13:39:37 -08:00

i18n_interpolation_deprecation.rb

I18n: move old-style interpolation syntax deprecation to Active Record. [#1044 state:resolved]

2008-09-20 19:13:50 +01:00

migration.rb

Merge with docrails

2008-12-07 03:27:53 +01:00

named_scope.rb

Merge docrails

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

observer.rb

Make observers define #after_find in the model only if needed.

2008-07-26 16:26:08 +02:00

query_cache.rb

ActiveRecord::QueryCache middleware

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

reflection.rb

Cache columns for has_and_belongs_to_many associations

2009-01-17 18:09:13 +13:00

schema_dumper.rb

Merge with docrails

2008-12-07 03:27:53 +01:00

schema.rb

Merge docrails.

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

serialization.rb

require json lib when serialization is loaded

2008-11-24 11:52:29 -06:00

session_store.rb

Move HTTP libs and middleware into ActionDispatch component

2009-01-27 18:54:01 -06:00

test_case.rb

Remove SQL Server cases from tests for latest adapter work to pass rails expected behavior.

2008-11-19 18:00:56 +01:00

timestamp.rb

Ensure of Model#create support custom updated_at and updated_on attributes [#1612 state:resolved]

2008-12-22 15:19:33 +00:00

transactions.rb

Introduce transaction_joinable flag to mark that the fixtures transaction can't joined, a new savepoint is required even if :requires_new is not set. Use :requires_new option instead of :nest. Update changelog.

2009-01-10 13:39:37 -08:00

validations.rb

Minor refactoring of validates_associated to replace #inject with #collect + #all?

2009-01-22 13:45:19 +13:00

version.rb

Assume that the next version is going to be 2.3 for now

2008-11-19 14:12:38 +01:00