Xavier Noria 207fa59675 Merge remote branch 'rails/master' ...

Conflicts:
	actionpack/lib/abstract_controller/base.rb

2010-06-20 23:13:19 +02:00

..

associations

Merge remote branch 'rails/master'

2010-06-20 23:13:19 +02:00

attribute_methods

Make sure timestamp is properly referenced

2010-05-11 20:06:26 +02:00

connection_adapters

remove executable permission from files that don't need it. [#4802 state:resolved]

2010-06-20 00:50:48 +02:00

locale

edit pass: the names of Rails components have a space, ie, "Active Record", not "ActiveRecord"

2010-06-14 23:22:04 +02:00

locking

Use arel instead of sql strings

2010-05-11 15:32:41 +01:00

railties

Cut down even further on rake -T noise

2010-06-09 17:14:53 -04:00

relation

Refactor build_arel: move joins out and simplify havings. [#4860 state:resolved]

2010-06-20 00:37:55 +02:00

serializers

to_xml with :include should skip_instruct on the included records [#4506 state:resolved]

2010-04-30 14:22:57 +02:00

validations

Revert "Make ActiveModel::Errors#add_on_blank and #add_on_empty accept an options hash and make various Validators pass their (filtered) options."

2010-05-15 21:55:16 +02:00

aggregations.rb

Adds title and basic description where needed.

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

association_preload.rb

edit pass: the names of Rails components have a space, ie, "Active Record", not "ActiveRecord"

2010-06-14 23:22:04 +02:00

associations.rb

Merge remote branch 'rails/master'

2010-06-20 23:13:19 +02:00

attribute_methods.rb

Adds title and basic description where needed.

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

autosave_association.rb

Adds title and basic description where needed.

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

base.rb

Merge remote branch 'rails/master'

2010-06-20 23:13:19 +02:00

callbacks.rb

Merge remote branch 'rails/master'

2010-06-20 23:13:19 +02:00

counter_cache.rb

Adds title and basic description where needed.

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

dynamic_finder_match.rb

Added typewriter tag to code.

2010-06-15 23:03:54 +04:30

dynamic_scope_match.rb

Added description and title to Dynamic Scope Match

2010-06-15 23:02:51 +04:30

errors.rb

Adds title.

2010-06-15 23:11:30 +04:30

fixtures.rb

Clarify Fixture#key_ and value_list

2010-06-08 17:05:29 -04:00

migration.rb

Adds title and minor changes.

2010-06-16 22:08:14 +04:30

named_scope.rb

All scopes are now cross-referenced.

2010-06-21 00:45:34 +04:30

nested_attributes.rb

Missing quote and indentation wrong

2010-06-17 14:26:13 +12:00

observer.rb

Merge remote branch 'rails/master'

2010-06-20 23:13:19 +02:00

persistence.rb

Adds title and minor changes.

2010-06-16 22:08:14 +04:30

query_cache.rb

Adds basic description and title.

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

railtie.rb

Merge remote branch 'rails/master'

2010-06-20 23:13:19 +02:00

reflection.rb

Adds basic description and title.

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

relation.rb

Adds basic description and title.

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

schema_dumper.rb

Adds title where needed.

2010-06-16 22:17:05 +04:30

schema.rb

Adds title where needed.

2010-06-16 22:17:05 +04:30

serialization.rb

Adds title and proper formatting to docs.

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

session_store.rb

Adds title and proper formatting to docs.

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

test_case.rb

Adds title and proper formatting to docs.

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

timestamp.rb

Adds title and proper formatting to docs.

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

transactions.rb

Merge remote branch 'rails/master'

2010-06-20 23:13:19 +02:00

validations.rb

Merge remote branch 'rails/master'

2010-06-20 23:13:19 +02:00

version.rb

Get ready for beta 4

2010-06-08 14:47:02 -04:00