This reverts commit 8f901dee.

Revert "Changed the CHANGELOG for active_support and improved the doc for inflector method classify"

This reverts commit 8d5fcb69.

Reason: Changelogs are not to be edited in docrails.

[ci skip]

This reverts commit e47c85c6.

Reason: Let's not nodoc without reason.

[ci skip]

This reverts commit 328e876a.

Reason: Let's not nodoc without reason.

[ci skip]

This reverts commit dfb69f2b.

Reason: Let's not nodoc without reason.

[ci skip]

Fixed some typos

Adding notes on PATCH to the upgrade guide. [ci skip]

Add test to counter cache test.rb

Don't autorequire mocha to avoid deprecation warnings

Due to commit 0123c39f, column
topic.unique_replies_count has been added, and these test started to
fail since the tests depends on the topic tables column info.

According to
https://github.com/rails/rails/blob/b601399b72ab56cc01368f02615af99f45d1
4f02/activerecord/lib/active_record/counter_cache.rb#L14, u can pass
more then one association to the `reset_counters` method.

- https://travis-ci.org/rails/rails/jobs/7264822 contains deprecated
  warnings given by Mocha version 0.14
- 632f215d added Mocha 0.14 to Gemfile
- But with the version, require: false was removed
- So Mocha started giving deprecation warnings
- Acc.to Mocha documentation(https://github.com/freerange/mocha#bundler)
  it should not be auto required.

exception are unlikely to pass this assertion, but since the assertions
raise an exception, the original exception is lost.

Bug fix: Evented notification subscribers can handle published events

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.

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

Mocha 0.14.0 was released with MT5 support. Switch back to gem

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.

This reverts commit 55975c71.

Raise an error when multiple included blocks are defined for a Concern

Squishy minitest5

begin
  Topic.new("hello" => "world")
rescue ActiveRecord::UnknownAttributeError => e
  e.record # => #<Topic ... >
  e.attribute # => "hello"
end

exit with non-zero to signal failure

Support array as root element in Postgresql JSON columns

Corrected documentation regarding validation errors

This reverts commit ad46884a.

Conflicts:
	actionpack/CHANGELOG.md
	actionpack/lib/action_dispatch/testing/integration.rb
	actionpack/test/controller/integration_test.rb

Reason: It will conflict with a lot of test cases. Better to call
`process` directly since this is a very uncommon HTTP method.

Fixes #10638.

fix rails4 regression with asset_host Proc returning nil