Latest changes in remote ip handling conflicted with each other in
tests. Related:

dd09811f
6a720226

Fix force_ssl redirect with params

ActionDispatch::Routing::RouteSet.url_for now handles passing params through to
ActionDispatch::Http::Url.url_for

Conflicts:

	actionpack/test/controller/base_test.rb

`ActionController.force_ssl` redirects http URLs to their https equivalent;
however, when a URL contains a query string, the resulting redirect lacked the
original query string.

Conflicts:

	actionpack/lib/action_controller/metal/force_ssl.rb

The first IP address in the X-Forwarded-For header is the originating IP

Partially reverts 14c89e72.

Hat tip to @tenderlove for paring down the TestTask!

Trusted proxies are configurable

Fixed documenation

Fix MIME::Type.parse handling of single media with a q value

Fix audio_tag and video_tag helpers

Closes #4919

Infinity should be a valid validates_length_of maximum

prevents the database.yml template option from being passed to PGConn

Fix url_for method's behavior. GH #3684.

Fix url_for method's behavior when it is called with :controller option which starts with "/" from multiple nested controller.

Closes #3864

Allow infinite values for validates_length_of. Particularly useful
for prettily defining an open ended range such as

validates_length_of :human_stupidity, :within => 0..Float::INFINITY

allow mass-assign version attribute in AR::SchemaMigration

Too painful to lose the compact shorthand form!

This reverts commit e848c525.

Conflicts:

	actionpack/lib/action_dispatch/routing/mapper.rb

Get ActiveRecord::TestCase back on its feet, despite deprecation. It requires SQLCounter which was moved to AR internal tests only.

Highlight defaults to HTML5 `mark` element

Make ActiveResource error parsing interoperate with ActionController. Closes #4881.

Display annotations from .coffee files in `rake notes`

[master] Optional start_day argument for Time#all_week.

Closes #4883

Add a testcase for non english filename. Related to #2982.