Aaron Patterson 2ef6270f8f Merge branch 'master' into fuuu ...

* master:
  Do not show optional (.:format) block for wildcard route [#6605 state:resolved]
  pushing id insertion and prefetch primary keys down to Relation#insert
  use prepared statements to fetch the last insert id
  escaping binary data encoding when inserting to sqlite3. Thanks Naruse! [#6559 state:resolved]
  schemas set by set_table_name are respected by the mysql adapter. [#5322 state:resolved]
  Reapply extensions when using except and only
  SJIS is an alias to Windows-31J in ruby trunk. Use SHIFT_JIS for this test
  Improved resolver docs a bit
  [action_view] docs for FileSystemResolver
  [action_view] added custom patterns to template resolver

2011-03-22 09:34:33 -07:00

..

associations

Merge branch 'master' into nested_has_many_through

2011-03-16 18:54:51 +00:00

attribute_methods

Merge remote branch 'rails/master' into identity_map

2011-02-15 12:01:04 -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

pushing id insertion and prefetch primary keys down to Relation#insert

2011-03-22 09:18:01 -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

remove some blanks

2011-03-11 23:08:55 +01:00

migration

Add :bulk => true option to change_table

2011-01-31 13:21:25 +00:00

railties

fix db:fixtures:load with FIXTURES specified [#6061 state:resolved]

2011-02-06 18:45:42 -02:00

relation

Merge branch 'master' into fuuu

2011-03-22 09:34:33 -07:00

serializers

dry up compute type in attribute

2010-12-15 14:02:30 -08:00

validations

Adjust unique constraint comment to include info about the RecordNotUnique exception

2011-03-13 11:49:56 +01:00

aggregations.rb

remove unnecessary module_eval

2011-01-18 09:36:33 -08:00

associations.rb

Abstract some common code from AssociationScope and JoinDependency::JoinAssociation into a JoinHelper module

2011-03-11 00:47:18 +00:00

attribute_methods.rb

Merge branch 'master' into nested_has_many_through

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

autosave_association.rb

Active Record typos.

2011-03-05 11:56:34 +01:00

base.rb

Merge branch 'master' into nested_has_many_through

2011-03-05 22:58:48 +00:00

callbacks.rb

Active Record typos.

2011-03-05 11:56:34 +01:00

counter_cache.rb

Merge remote branch 'rails/master' into identity_map

2010-12-20 11:23:07 -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 remote branch 'rails/master' into identity_map

2011-02-18 15:29:33 -03:00

identity_map.rb

No need to have reinit_with inside an InstanceMethods module.

2011-02-18 16:04:47 -03:00

log_subscriber.rb

fixing tests on 1.8, using a list of lists because order is important

2011-02-10 14:17:09 -08:00

migration.rb

require core_ext/array/wrap in active_record/migration

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

named_scope.rb

fixes: ActiveRecord::Base.scopes includes all scopes defined in all subclasses

2011-02-24 11:17:06 -08:00

nested_attributes.rb

Merge remote branch 'rails/master' into identity_map

2011-02-18 15:29:33 -03:00

observer.rb

Fix observer callbacks firing multiple times on descendant instances

2011-02-22 16:25:19 -08:00

persistence.rb

pushing id insertion and prefetch primary keys down to Relation#insert

2011-03-22 09:18:01 -07:00

query_cache.rb

Adds basic description and title.

2010-06-16 22:15:04 +04:30

railtie.rb

Merge remote branch 'rails/master' into identity_map

2011-02-15 12:01:04 -03:00

reflection.rb

Simplify implementation of ThroughReflection#chain

2011-03-11 00:51:57 +00:00

relation.rb

pushing id insertion and prefetch primary keys down to Relation#insert

2011-03-22 09:18:01 -07:00

result.rb

adjust query counts to be consistent across databases, make sure database log the same things

2011-02-04 18:14:59 -08:00

schema_dumper.rb

kill unused variable warnings

2011-01-11 15:29:35 -08:00

schema.rb

Allow to run migrations from more than one directory

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

serialization.rb

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

2010-10-06 23:16:13 +02:00

session_store.rb

almost fisted

2011-02-04 18:14:59 -08:00

test_case.rb

removing limits and offsets from COUNT queries unless both are specified. [#6268 state:resolved]

2011-02-25 15:38:59 -08:00

timestamp.rb

Updates to ActiveRecord::Timestamp documentation.

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

transactions.rb

Merge remote branch 'rails/master' into identity_map

2011-02-15 12:01:04 -03:00

validations.rb

copy-edits 8d96b89

2011-02-21 11:37:08 +01:00

version.rb

Update the version.rb files to include a PRE part

2010-11-16 17:19:46 -08:00