Xavier Noria bf2b9d2de3 Merge branch 'master' of github.com:lifo/docrails ...

Conflicts:
	RELEASING_RAILS.rdoc
	actionpack/lib/sprockets/railtie.rb
	actionpack/test/template/sprockets_helper_test.rb
	activerecord/test/cases/calculations_test.rb
	railties/guides/source/3_1_release_notes.textile
	railties/guides/source/active_resource_basics.textile
	railties/guides/source/command_line.textile

2011-08-13 16:30:07 -07:00

..

locale

Remove weak_passwords list and the length/strong password validator, leave that up to the programmer

2010-12-19 15:01:29 -02:00

mass_assignment_security

MassAssignmentProtection: consider 'id' insensetive in StrictSanitizer

2011-08-13 16:22:26 -07:00

serializers

ActiveModel support for the :include serialization option

2011-07-17 11:34:07 -07:00

validations

Fix example code for #validates_with instance method

2011-07-24 12:13:23 -07:00

attribute_methods.rb

Made attribute_method_matchers_cache private + doc

2011-07-17 14:51:34 +10:00

callbacks.rb

Remove extra white spaces on ActiveModel docs.

2011-05-23 20:39:10 -03:00

conversion.rb

Rename new method to_path to to_partial_path to avoid conflicts with File#to_path and similar.

2011-08-13 16:22:26 -07:00

dirty.rb

Documentation fix: adding missing equal sign in code sample for ActiveModel::Dirty.

2011-07-20 10:31:57 +02:00

errors.rb

Fixed typo

2011-08-13 16:22:33 -07:00

lint.rb

Rename new method to_path to to_partial_path to avoid conflicts with File#to_path and similar.

2011-08-13 16:22:26 -07:00

mass_assignment_security.rb

Minor formating fix

2011-06-24 03:52:39 +06:00

naming.rb

Rename new method to_path to to_partial_path to avoid conflicts with File#to_path and similar.

2011-08-13 16:22:26 -07:00

observer_array.rb

Remove extra white spaces on ActiveModel docs.

2011-05-23 20:39:10 -03:00

observing.rb

Allow ActiveRecord observers to be disabled.

2011-08-12 20:48:44 -07:00

railtie.rb

Some railties cleanup:

2009-12-31 13:12:52 -08:00

secure_password.rb

Remove superfluous whitespace from ActiveModel::SecurePassword

2011-05-22 04:02:47 -07:00

serialization.rb

ActiveModel support for the :include serialization option

2011-07-17 11:34:07 -07:00

test_case.rb

Autoload AS test case

2010-01-04 16:22:46 -06:00

translation.rb

Get rid of the alternate namespace lookup.

2011-06-11 18:01:26 +02:00

validations.rb

Remove extra white spaces on ActiveModel docs.

2011-05-23 20:39:10 -03:00

validator.rb

Remove #among? from Active Support

2011-04-13 20:25:28 +08:00

version.rb

Master version is 3.2.0.beta

2011-06-30 10:18:36 -03:00