be more specific about csrf token and ajax - not whitelisted outside of jquery-rails [ci skip]
`find_in_batches` now returns an `Enumerator` when called without a block, so that it
can be chained with other `Enumerable` methods.
Fix breakage in XmlMini

- Boolean parsing breaks on non strings (i.e. integer 1|0)
- Symbol parsing breaks on non strings.
- BigDecimal parsing breaks due to missing require.
- Update changelog.
Improve ERB dependency detection.

The current implementation can't handle some special cases of oddly-formatted Ruby. Now we are able to detect them:

* Multi-line arguments on the `render` call
* Strings containing quotes, e.g. `"something's wrong"`
* Multiple kinds of identifiers - instance variables, class variables and globals
* Method chains as arguments for the `render` call

Also, this fix reduces the rate of "false positives" which showed up when we had calls/access to identifiers containing `render`, like `surrender` and `rendering`.
Avoid scanning multiple render calls as a single match.

Each chunk of text coming after `render` is now handled individually as a possible list of arguments.
Update changelog
Clarify behavior of json_escape, update examples

The behavior of json_escape was fixed in 2f1c5789, but the doc
changes and example in that commit incorrectly indicated that the
return value would be html-safe. Since quotation marks are
preserved, the raw value is not safe to use in other contexts
(specifically HTML attributes).
Skip Spring App Generator tests on JRuby

Spring makes extensive use of Process.fork, so won't be able to provide
JRuby Support, hence skip these tests on JRuby.
Merge pull request #13646 from jenseng/json_escape

Clarify behavior of json_escape [ci skip]
Merge pull request #13687 from gaurish/spring-has-no-love-for-jruby

Skip Spring App Generator tests on JRuby
doc proc/lambda arg on inclusion validation. Closes #13689. [ci skip]
highlight http://localhost:3000 in README.md. Closes #13643. [ci skip]

This has no effect on the API docs. The main API page is taken from:
    railties/RDOC_MAIN.rdoc
fix bug in becomes! when changing from base to subclass. Closes #13272.
standardize on jruby_skip & rbx_skip

This Adds helpers(jruby_skip & rbx_skip). In Future, Plan is to use
these helpers instead of calls directly to
RUBY_ENGINE/RbConfig/JRUBY_VERSION
Merge pull request #13693 from gaurish/typo

[JRuby] Fix incorrect RUBY_ENGINE value
setup Bundler in engines `bin/rails` stub.

This is necessary when bundling gems locally using `BUNDLE_PATH`.
Without this patch `bin/rails` fails with:

```
/Users/senny/.rbenv/versions/2.0.0-p353/lib/ruby/site_ruby/2.0.0/rubygems/core_ext/kernel_require.rb:55:in `require': cannot load such file -- rails/all (LoadError)
	from /Users/senny/.rbenv/versions/2.0.0-p353/lib/ruby/site_ruby/2.0.0/rubygems/core_ext/kernel_require.rb:55:in `require'
	from bin/rails:7:in `<main>'
```
Updated Changelog to reflect removal of :dependent => :restrict

Based on https://github.com/rails/rails/issues/2502, the option has
been removed.
Merge pull request #13699 from rystraum/dependent-restrict-removal

Updated Changelog to reflect removal of :dependent => :restrict
Only lookup `config.log_level` for stdlib `::Logger`. Closes #11665.

This prevents Rails from assigning meaningless log levels to third
party loggers like log4r. If `Rails.logger` is not `kind_of?(::Logger)`
we simply assign the `config.log_level` as is.

This bug was introduced by #11665.
removed extra comma [ci skip]