John Mileham 043b624390 Don't merge base opts into includes when serializing ARs ...

Conflicts:

	activerecord/lib/active_record/serialization.rb

2011-05-26 11:40:57 -04:00

..

associations

Merge branch 'master' of github.com:rails/rails

2011-05-25 22:49:23 +02:00

attribute_methods

Remove extra white spaces on ActiveRecord docs.

2011-05-23 20:58:25 -03:00

coders

Make serialized columns with explicit object_type return a new instance of the object instead of nil

2011-02-03 09:08:45 -08:00

connection_adapters

Merge branch 'master' of github.com:rails/rails

2011-05-25 22:49:23 +02:00

fixtures

fixing 1.8 support for new fixture tests

2011-05-23 15:06:13 -07:00

locale

Deletes trailing whitespaces (over text files only find * -type f -exec sed 's/[ \t]*$//' -i {} \;)

2010-08-14 04:12:33 -03:00

locking

Closes GH #1032

2011-05-19 01:20:26 -04:00

migration

Remove extra white spaces on ActiveRecord docs.

2011-05-23 20:58:25 -03:00

railties

Database.rake file fixed for load_generators

2011-05-25 13:57:44 +05:30

relation

Merge branch 'master' of git://github.com/lifo/docrails

2011-05-25 22:48:47 +02:00

serializers

Remove extra white spaces on ActiveRecord docs.

2011-05-23 20:58:25 -03:00

validations

Remove extra white spaces on ActiveRecord docs.

2011-05-23 20:58:25 -03:00

aggregations.rb

Remove extra white spaces on ActiveRecord docs.

2011-05-23 20:58:25 -03:00

associations.rb

Merge branch 'master' of git://github.com/lifo/docrails

2011-05-25 22:48:47 +02:00

attribute_methods.rb

Merge branch 'master' into nested_has_many_through

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

autosave_association.rb

Remove extra white spaces on ActiveRecord docs.

2011-05-23 20:58:25 -03:00

base.rb

Merge pull request #1285 from joshk/remove_active_record_deprecations

2011-05-25 13:48:35 -07:00

callbacks.rb

Added back the Callback debugging section by interrogating the _*_callbacks method

2011-03-29 11:22:16 +08:00

counter_cache.rb

Remove extra white spaces on ActiveRecord docs.

2011-05-23 20:58:25 -03:00

dynamic_finder_match.rb

be kind to the garbage collector: only instantiate objects when absolutely necessary

2010-09-27 18:07:35 -07:00

dynamic_scope_match.rb

constructor should not do so much work; avoid allocating object if possible

2010-09-27 17:38:49 -07:00

errors.rb

Deletes trailing whitespaces (over text files only find * -type f -exec sed 's/[ \t]*$//' -i {} \;)

2010-08-14 04:12:33 -03:00

fixtures.rb

Merge branch 'master' of github.com:rails/rails

2011-05-25 22:49:23 +02:00

identity_map.rb

Fix typos in IM documentation

2011-05-10 03:44:57 -07:00

log_subscriber.rb

Make the identity map use the instrumentation infrastructure so we can style the messages nicely with colors (FIXME: Can someone look into why the test is not working?)

2011-05-01 19:10:21 -06:00

migration.rb

require core_ext/array/wrap in active_record/migration

2010-12-10 08:33:48 +01:00

named_scope.rb

Bring back some bits of documentation for scopes which were removed as part of the reversion in 256b363

2011-04-17 20:55:24 +01:00

nested_attributes.rb

Remove dead branch code that appeared back in a merge.

2011-04-10 13:03:49 +02:00

observer.rb

ActionMailer deliver method Documentation corrected Ticket #761

2011-05-21 13:55:52 +05:30

persistence.rb

Merge branch 'master' of git://github.com/lifo/docrails

2011-05-25 22:48:47 +02:00

query_cache.rb

ensure query cache is cleared when Rack body is closed, fixes bug reported on 951e18abea

2011-05-04 15:24:26 -07:00

railtie.rb

Everyone receives app as argument for consistency.

2011-05-25 01:37:55 +02:00

reflection.rb

Merge branch 'master' of github.com:rails/rails

2011-05-25 22:49:23 +02:00

relation.rb

Merge branch 'master' of git://github.com/lifo/docrails

2011-05-25 22:48:47 +02:00

result.rb

Remove extra white spaces on ActiveRecord docs.

2011-05-23 20:58:25 -03:00

schema_dumper.rb

Remove extra white spaces on ActiveRecord docs.

2011-05-23 20:58:25 -03:00

schema.rb

Allow to run migrations from more than one directory

2010-12-09 00:04:36 +01:00

serialization.rb

Don't merge base opts into includes when serializing ARs

2011-05-26 11:40:57 -04:00

session_store.rb

Remove extra white spaces on ActiveRecord docs.

2011-05-23 20:58:25 -03:00

test_case.rb

Remove extra white spaces on ActiveRecord docs.

2011-05-23 20:58:25 -03:00

timestamp.rb

Updates to ActiveRecord::Timestamp documentation.

2011-02-05 09:07:00 -08:00

transactions.rb

Use IM when trying to load records using ID.

2011-04-04 10:48:12 +02:00

validations.rb

Remove extra white spaces on ActiveRecord docs.

2011-05-23 20:58:25 -03:00

version.rb

Bump versions for rc1

2011-05-21 20:56:52 -05:00