Signed-off-by: NJosé Valim <jose.valim@gmail.com>

Signed-off-by: NJosé Valim <jose.valim@gmail.com>

Signed-off-by: NJosé Valim <jose.valim@gmail.com>

[#4645 state:resolved]
Signed-off-by: NJosé Valim <jose.valim@gmail.com>

Broke mysql tests.

This reverts commit edec1afe.

Conflicts:

	activerecord/test/cases/migration_test.rb

[#3234 state:open]

[#3452 state:committed]
Signed-off-by: NJeremy Kemper <jeremy@bitsweat.net>

[#4640 state:committed]
Signed-off-by: Nwycats <wycats@gmail.com>

Nested records (re: autosave) are now updated even when the intermediate parent record is unchanged [#4242 state:resolved]
Signed-off-by: NJosé Valim <jose.valim@gmail.com>

[#4629 state:resolved]
Signed-off-by: NJosé Valim <jose.valim@gmail.com>

[#4630 state:resolved]
Signed-off-by: NJosé Valim <jose.valim@gmail.com>

[#4626 state:resolved]
Signed-off-by: NJosé Valim <jose.valim@gmail.com>

[#4635 state:resolved]
Signed-off-by: NJosé Valim <jose.valim@gmail.com>

[#4636 state:resolved]
Signed-off-by: NJosé Valim <jose.valim@gmail.com>

Cut the fat and make session stores rely on request.cookie_jar and change set_session semantics to return the cookie value instead of a boolean.

Fixed numericality validator in ActiveModel to reject hex numbers for floats completely [#4622 state:commited]
Signed-off-by: NJosé Valim <jose.valim@gmail.com>

Signed-off-by: NJosé Valim <jose.valim@gmail.com>

[#4628 state:resolved]
Signed-off-by: NJosé Valim <jose.valim@gmail.com>

Signed-off-by: NXavier Noria <fxn@hashref.com>

This reverts commit ade756fe.

[#4604 state:committed]
Signed-off-by: NJosé Valim <jose.valim@gmail.com>

Valid hex strings aren't valid float column values, to match the integer restriction.  [#4622 state:resolved]

[#4612]
Signed-off-by: NJeremy Kemper <jeremy@bitsweat.net>

[#2919 state:committed]
Signed-off-by: NJeremy Kemper <jeremy@bitsweat.net>

[#3642 state:committed]
Signed-off-by: NMarius Nuennerich <marius@nuenneri.ch>
Signed-off-by: NJeremy Kemper <jeremy@bitsweat.net>

a cloned object no longer mimics changed flags from creator , plus a test case [#4614 state:resolved]
Signed-off-by: NJosé Valim <jose.valim@gmail.com>

This reverts commits af0d1a88 and 64d109e3.

Signed-off-by: NXavier Noria <fxn@hashref.com>

* Default Encoding.default_internal to UTF-8
* Eliminated the use of file-wide magic comments to coerce code evaluated inside the file
* Read templates as BINARY, use default_external or template-wide magic comments
  inside the Template to set the initial encoding
  * This means that template handlers in Ruby 1.9 will receive Strings encoded
    in default_internal (UTF-8 by default)
* Create a better Exception for encoding issues, and use it when the template
  source has bytes that are not compatible with the specified encoding
* Allow template handlers to opt-into handling BINARY. If they do so, they
  need to do some of their own manual encoding work
* Added a "Configuration Gotchas" section to the intro Rails Guide instructing
  users to use UTF-8 for everything
* Use config.encoding= in Ruby 1.8, and raise if a value that is an invalid
  $KCODE value is used

Also:
* Fixed a few tests that were assert() rather than assert_equal() and
  were caught by Minitest requiring a String for the message
* Fixed a test where an assert_select was misformed, also caught by
  Minitest being more restrictive
* Fixed a test where a Rack response was returning a String rather
  than an Enumerable