3 1 stable
Fix build 3-1-stable
This commit improves the handling of default_url_options in integration tests by making behave closer to how a real application operates. Specifically the following issues have been addressed: * Options specified in routes.rb are used (fixes #546) * Options specified in controllers are used * Request parameters are recalled correctly * Tests can override default_url_options directly
Just cherry-picked fixes for asset precompile for 3-1-stable
A callable object passed as a constraint for a route may access the request parameters as part of its check. This causes the combined parameters hash to be cached in the environment hash. If the constraint fails then any subsequent access of the request parameters will be against that stale hash. To fix this we delete the cache after every call to `matches?`. This may have a negative performance impact if the contraint wraps a large number of routes as the parameters hash is built by merging GET, POST and path parameters. Fixes #2510. (cherry picked from commit 5603050)
…amoa. Further, Samoa and Tokelau jumped across the IDL from Dec 29 to Dec 31, 2011 switching from UTC-11 to UTC+13. American Samoa did not make the change and remains at UTC-11. Pacific/Fakaofo and Pacific/Apia are in TZInfo and documentation about the dateline change is in austalasia at IANA. (cherry picked from commit 5fe88b1)
…angerous especially with Rack::Cache), it should only be loaded when the flash method is called
Lock mocha to fix build
nil.stubs is not allowed in new version of mocha
(cherry picked from commit d6bbd33)
Restrict multi_json to >= 1.0, < 1.3 to avoid API changes in 1.3
Some API changes are there above 1.3.
…or_3_1 Address an error for test_has_many_through_polymorphic_has_one with Oracle
Fixing Identity Map when using find select
with Oracle for the 3-1-stable branch
…make the code harder to read. Minor changes to contain_all_columns in IdentityMap.
…add, so it's more readable
…or all the columns, so we don't get 'MissingAttributeError' later when trying to access other fields of the same record.
Issue with schema dump
Fix build for branch 3-1-stable - return the same session hash object
Make sure to return the same hash object instead of returning a new one. Returning a new one causes failures on cookie store tests, where it tests for the 'Set-Cookie' header with the session signature. This is due to the hash ordering changes on Ruby 1.8.7-p358.