Update hash format for render_text_test
Introduce `render :plain` for render plain text

This is as an option to render content with a content type of
`text/plain`. This is the preferred option if you are planning to render
a plain text content.

Please see #12374 for more detail.
Introduce `render :html` for render HTML string

This is an option for to HTML content with a content type of
`text/html`. This rendering option calls `ERB::Util.html_escape`
internally to escape unsafe HTML string, so you will have to mark your
string as html safe if you have any HTML tag in it.

Please see #12374 for more detail.
Fix a fragile test on `action_view/render`

This test were assuming that the list of render options will always be
the same. Fixing that so this doesn't break when we add/remove render
option in the future.
Cleanup `ActionController::Rendering`
Update guides for new rendering options

* Introduces `:plain`, `:html`, `:body` render option.
* Update guide to use `render :plain` instead of `render :text`.
Add missing CHANGELOG entry to Action View
Add `#no_content_type` attribute to `AD::Response`

Setting this attribute to `true` will remove the content type header
from the request. This is use in `render :body` feature.
Update upgrading guide regarding `render :text`
Merge pull request #14062 from sikachu/ps-render-format

Introduce `:plain`, `:html`, and `:body` render options.
Sync 4.1 release notes with changes since 7f648bc7 [ci skip]
Merge pull request #14097 from chancancode/sync_4_1_release_notes

Sync 4.1 release notes with changes since 7f648bc7
Escape format, negative_format and units options of number helpers

Previously the values of these options were trusted leading to
potential XSS vulnerabilities.

Fixes: CVE-2014-0081
Correctly escape PostgreSQL arrays.

Thanks Godfrey Chan for reporting this!

Fixes: CVE-2014-0080
Preparing for 4.1.0.beta2 release
Merge branch '4-1-0-beta2'

Conflicts:
	actionview/CHANGELOG.md
	activerecord/CHANGELOG.md
Use the reference for the mime type to get the format

Before we were calling to_sym in the mime type, even when it is unknown
what can cause denial of service since symbols are not removed by the
garbage collector.

Fixes: CVE-2014-0082
Typo fix for unscope
Merge pull request #14098 from Amit-Thawait/master

Typo fix for unscope [ci skip]
cache queries in the Model.find(id) path