Merge pull request #12085 from valk/master

FIX reload! within rails console --sandbox causes undefined method rollb...
Merge branch 'master' of github.com:rails/docrails
cache misses should return self
Don't create fibers just to iterate
require a class for cache computations
no need for the const_get since we lock
add a failing test for marshal + cache problems
move the cache to the AR models and populate it on inherited
no need to fully qualify
remove unused variable
reduce relation allocations
reconnect after the fork returns
Merge pull request #12090 from njakobsen/merger-performance

[Performance] Don't create fibers while merging bind variables
Don't use Enumerable#next in pluck since it is very slow
Update mapper documenation for match helper [ci skip]
This piece of documentation is out of date.
The use of match without any via option is prevented, now
the HTTP verbs have to be explicitly set. If they're not set then
the error message in normalize_conditions! (around line 186) is
shown.
Using indent method to refactor controller generator.

[John J. Wang & Prathamesh Sonpatki]
Merge pull request #12093 from wangjohn/indentation_in_generator

Using indent method to refactor controller generator.
Merge pull request #12091 from rywall/pluck-optimization

[Perf] Don't use Enumerable#next in pluck since it is very slow
upgrade jruby dependencies
Merge pull request #12095 from kassio/upgrade-jruby-gems

Upgrade jruby dependencies