Allow fields_for on a nested_attributes association to accept an explicit collection to be used. [#2648 state:resolved]
Signed-off-by: NEloy Duran <eloy.de.enige@gmail.com>

Signed-off-by: NEloy Duran <eloy.de.enige@gmail.com>

Raise an exception with friendlier error message when attempting to build a polymorphic belongs_to with accepts_nested_attributes_for. [#2318 state:resolved]
Signed-off-by: NEloy Duran <eloy.de.enige@gmail.com>

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

This has just been confusing. Better to educate than band-aid.

This reverts commit 18a24274.
Originally from http://dev.rubyonrails.org/ticket/8845 [drnic]

Ruby 1.9 compat: Avoid using the return value of FileUtils.mkdir_p, as it does not return a String but an Array in Ruby 1.9

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

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

Signed-off-by: NJeremy Kemper <jeremy@bitsweat.net>

Signed-off-by: NMichael Koziarski <michael@koziarski.com>

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

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

Signed-off-by: NYehuda Katz <wycats@gmail.com>

Signed-off-by: NJoshua Peek <josh@joshpeek.com>

Changed ActiveRecord to use new callbacks and speed up observers by only notifying events that are actually being consumed.
Signed-off-by: NJoshua Peek <josh@joshpeek.com>

Cleanup hacky routing with controller_path in url helper tests. This doesn't work in real life anyway.

Addresses CVE-2009-3009

When accepting character input from outside of your application you can't
blindly trust that all strings are properly encoded. With these methods
you can check incoming strings and clean them up if necessary.
Signed-off-by: NMichael Koziarski <michael@koziarski.com>

Conflicts:

	activesupport/lib/active_support/multibyte.rb

Use a constant-time comparison algorithm to compare the candidate HMAC with the calculated HMAC to prevent leaking information about the calculated HMAC.
Signed-off-by: NMichael Koziarski <michael@koziarski.com>

Signed-off-by: NJoshua Peek <josh@joshpeek.com>