Conflicts:

	actionpack/lib/action_controller/metal/implicit_render.rb

Signed-off-by: NSantiago Pastorino <santiago@wyeworks.com>

It seems like in 89c5b9ae Aaron actually put the test in action_dispatch folder. However, there's already a `test/dispatch` directory which I think it's more appropriate.
Signed-off-by: NAndrew White <andyw@pixeltrix.co.uk>

Update the wildcard route to be non-greedy by default, therefore be able to match the (.:format) segment [#6605 state:resolved]

After some discussion with Andrew White, it seems like this is a better approach for handling a wildcard route. However, user can still bring back the old behavior by supplying `:format => false` to the route.
Signed-off-by: NAndrew White <andyw@pixeltrix.co.uk>

Added Base.http_basic_authenticate_with to do simple http basic authentication with a single class method call [DHH]

Signed-off-by: NSantiago Pastorino <santiago@wyeworks.com>

Engines that use isolate_namespace with nested modules should set correct module prefix for their routes.

Signed-off-by: NSantiago Pastorino <santiago@wyeworks.com>

This reverts commit 45c233ef.
Signed-off-by: NSantiago Pastorino <santiago@wyeworks.com>

This would become useful for site which sometime transferring sensitive information such as account information on particular controller or action.

This featured was requested by DHH.

This will allow user to be able to force all requests to be under HTTPS protocol.

This commit was a request from DHH. Special thanks to Josh Peek as well for making `Rack::SSL`.

A couple of things worth mentioning here:

 - "{" is a metacharacter, should be escaped
   if it is meant to match a "{". The code
   worked, though, because the regexp engine
   is tolerant to this, but issued warnings.

 - gsub accepts a string as first argument.
   That's the best idiom to use when your
   pattern has no metacharacters, since gsub
   interprets the string as an exact substring
   to look for, rather than a regexp. The
   benefit is that your pattern is crystal
   clear and needs no backslashes.

Allow FormHelper#form_for to specify the :method as a direct option instead of through the :html hash [DHH]