test refactor
Merge pull request #10527 from zenspider/squishy_minitest5

Squishy minitest5
Merge pull request #10652 from md5/concern-multiple-included

Raise an error when multiple included blocks are defined for a Concern
Revert "just call the class method since we know the callbacks are stored at the"

This reverts commit 55975c71ec9c2c18b67020484959ff5c69d4d3fb.
Fix named routing regression from 3.2.13

When named route that is nested is used in 3.2.13

Example `routes.rb`:

```
resources :nested do
  resources :builder, :controller => 'nested/builder'
end
```

In 3.2.12 and 3.2.12 this named route would work:

```
nested_builder_path(:last_step, :nested_id => "foo")
```

Generating a url that looks like `/nested/foo/builder/last_step`. This PR fixes the regression when building urls via the optimized helper. Any explicit keys set in the options are removed from the list of implicitly mapped keys.

Not sure if this is exactly how the original version worked, but this fixes this use case regression.
Mocha 0.14.0 was released with MT5 support. Switch back to gem
Merge pull request #10656 from zenspider/fix_mocha_back

Mocha 0.14.0 was released with MT5 support. Switch back to gem
let Ruby do the is_a check for us
Fix AM testcase break with mail 2.5.4. It seems that AM's testcase was wrong.
plugin new missing license spec

When bundling a gem created with
rails plugin new
Bundler outputs the following warning when building the gem:
WARNING:  licenses is empty

	modified:   railties/lib/rails/generators/rails/plugin_new/templates/%name%.gemspec
Merge pull request #10657 from AJ-Acevedo/plugin

plugin new missing license spec
"normalize_callback_params" doesn't require name param
Fix documentation for ActionMailer template names.

ActionMailer templates that are not plain text do not require *.text.* in the name and will fail to be picked up automatically if it is included in the name.
make "rails dbconsole" work with activerecord-postgis-adapter
Eliminate minitest warnings

https://github.com/seattlerb/minitest/commit/9a57c520ceac76abfe6105866f8548a94eb357b6#L15R8
include bind values from the default scope
stop doing assingments in an iterator
Bug fix: Evented notification subscribers can handle published events
Merge pull request #10672 from carllerche/master

Bug fix: Evented notification subscribers can handle published events
stop swallowing exceptions in assert_queries.  Methods that raise an
exception are unlikely to pass this assertion, but since the assertions
raise an exception, the original exception is lost.