when using respond_with with an invalid resource and custom options, the default response status and error messages should be returned
Signed-off-by: NJosé Valim <jose.valim@gmail.com>

* 'master' of github.com:rails/rails:
  Make action_method? public and change implicit rendering to override it instead.

* master: (51 commits)
  order is not guaranteed by this select, so add an order and call first!
  oracle stores this with microseconds, so convert to seconds before comparing
  make sure that active connections are not cleared during test when an exception happens
  clearing active connections in the ConnectionManagement middleware if an exception happens
  proxy body responses so we close database connections after body is flushed
  Pass the proper method_name instead of hardcoding to action_name.
  Quote find_in_batches ORDER BY clause [#6620 state:resolved]
  Delegate first!, last!, any? and many? to scoped
  Dont call authenticate_or_request_with_http_basic twice
  Remove 'warning: ambiguous first argument' when running ActionPack tests
  Change exists? so that it doesn't instantiate records [#6127 state:resolved]
  Move mapper_test to the appropriate location
  Update the wildcard route to be non-greedy by default, therefore be able to match the (.:format) segment [#6605 state:resolved]
  Fix examples
  Added Base.http_basic_authenticate_with to do simple http basic authentication with a single class method call [DHH]
  make sure we have an active database connection before running each connection management test
  adding active_connections? to the connection pool for finding open connections
  adding active_connection? to the connection pool
  testing app delegation from the ConnectionManagement middleware
  namespacing connection management tests. ❤
  ...

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.