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>

Don't raise exceptions for missing javascript_include_tag or stylesheet_link_tag sources unless the :cache or :concat options are given. [#2738 state:resolved]
Signed-off-by: NJoshua Peek <josh@joshpeek.com>

If session_options[:id] is requested when using CookieStore, unmarshal the session to access it [#2268 state:resolved]
Signed-off-by: NJoshua Peek <josh@joshpeek.com>

Revert "Assert primary key does not exist in habtm when the association is defined, instead of doing that everytime a record is inserted."

Test failures on PostgreSQL.

[#3128 state:open]

This reverts commit da636809.

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

Remove ClassInheritableAttributes test case, already covered by ActiveSupport [#3114 state:resolved]
Signed-off-by: NJoshua Peek <josh@joshpeek.com>

Assert primary key does not exist in habtm when the association is defined, instead of doing that everytime a record is inserted.

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