Support data: url scheme in asset paths.
multi_json is restricted to < 1.3.

Some API changes are there above 1.3.
Merge pull request #5862 from arunagw/multi_json_fix_3-1-stable

Restrict multi_json to >= 1.0, < 1.3 to avoid API changes in 1.3
Don't convert params if the request isn't HTML - fixes #5341
(cherry picked from commit d6bbd337ef1b96ed246bccaaf6e8b15a7077b9aa)
mocha can be locked here as new version is failing

nil.stubs is not allowed in new version of mocha
Merge pull request #6046 from arunagw/lock_mocha_to_fix_build

Lock mocha to fix build
Escape interpolated params when redirecting - fixes #5688
fix the Flash middleware loading the session on every request (very dangerous especially with Rack::Cache), it should only be loaded when the flash method is called
Failing test for #6034
Correcting some confusion. Pago Pago is part of American Samoa, not Samoa.

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 5fe88b11f11bb3b30bc23c57b36be4f027d915ba)
fix grammar in deprecation message [ci skip]
Reset the request parameters after a constraints check

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 56030506563352944fed12a6bb4793bb2462094b)
Fix #3993 assets:precompile task does not detect index files
Added test for assets:precompile for index files
Merge pull request #6152 from route/assets_precompile_task_3_1

Just cherry-picked fixes for asset precompile for 3-1-stable
Refactor the handling of default_url_options in integration tests

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
Don't ignore nil positional arguments for url helpers - fixes #6196.
Update performance profiler to work with latest ruby-prof, fix 3-1-stable build
Merge pull request #6261 from carlosantoniodasilva/fix-build-3-1

Fix build 3-1-stable
Ruby-Prof works with 1.9.3. Let's run.