Remove j alias for ERB::Util.json_escape
AR::Relation#model would be a better API than AR::Relation#klass
Make a doc example output in match actual output

Make doc output in grouped_options_for_select divider example match
actual output. The options groups were in backwards order of actual.
association_basics, updated how inverse_of works

Fixed bug in the example code. A bit related to rails issue in
 https://github.com/rails/rails/issues/3223
Extended documentation for `time_ago_in_words` helper
Revert "association_basics, updated how inverse_of works"

This reverts commit 8cb9460437eddde6952fbebbc969203cd4d00294.

Reason: #7377 was merged and it fixes this behavior.
Allow users to choose when to eager_load the application or not.

Previously, the eager load behavior was mostly coupled to
config.cache_classes, however this was suboptimal since in
some environments a developer may want to cache classes but
not necessarily load them all on boot (for example, test env).

This pull request also promotes the use of config.eager_load
set to true by default in production. In the majority of the
cases, this is the behavior you want since it will copy most
of your app into memory on boot (which was also the previous
behavior).

Finally, this fix a long standing Rails bug where it was
impossible to access a model in a rake task when Rails was
set as thread safe.
Remove allow_concurrency as a flag

The flag was mainly used to add a Rack::Lock middleware to
the stack, but the only scenario the lock is desired is in
development.

If you are deploying on a not-threaded server, the Rack::Lock
does not provide any benefit since you don't have concurrent
accesses. On the other hand, if you are on a threaded server,
you don't want the lock, since it defeats the purpose of using
a threaded server.

If there is someone out there, running on a thread server
and does want a lock, it can be added to your environment
as easy as: `use Rack::Lock`
Make ActiveSupport::Autoload local

Previously, ActiveSupport::Autoload was global and reserved
for usage inside Rails. This pull request makes it local,
fixes its test (they were not being run because its file
was named wrongly) and make it part of Rails public API.
Get rid of config.preload_frameworks in favor of config.eager_load_namespaces

The new option allows any Ruby namespace to be registered and set
up for eager load. We are effectively exposing the structure existing
in Rails since v3.0 for all developers in order to make their applications
thread-safe and CoW friendly.
Deprecate config.threadsafe!
add Rack::Lock for webrick
Use a model without counter cache to test read-only attributes
Clarify and correct the description for the --full option of the plugin_new generator
Merge pull request #6499 from lazylester/patch-1

Clarify and correct the description for the --full option of the 
plugin_new generator. [ci skip]
Merge pull request #7225 from rails/eager_load

Improve eager load on Rails
Set eager load option in "make_basic_app" for railties tests

Avoid output with config option not set when running some tests.
Remove app building setup/teardown for remote ip railtie tests

These tests rely on "make_basic_app", which is a faster version that
does not need to create the whole app directory structure.
Merge pull request #3578 from amatsuda/remove_j_alias_for_json_escape

Remove j alias for ERB::Util.json_escape
Add CHANGELOG entry for #3578 [ci skip]