Merge branch 'master' into adequaterecord

* master: (32 commits)
  Typo fix for unscope
  Use the reference for the mime type to get the format
  Preparing for 4.1.0.beta2 release
  Correctly escape PostgreSQL arrays.
  Escape format, negative_format and units options of number helpers
  Sync 4.1 release notes with changes since 7f648bc7 [ci skip]
  Update upgrading guide regarding `render :text`
  Add `#no_content_type` attribute to `AD::Response`
  Add missing CHANGELOG entry to Action View
  Update guides for new rendering options
  Cleanup `ActionController::Rendering`
  Fix a fragile test on `action_view/render`
  Introduce `render :html` for render HTML string
  Introduce `render :plain` for render plain text
  Update hash format for render_text_test
  Introduce `render :body` for render raw content
  Don't use `# =>` when it is not the expression values
  Fix the column name [ci skip]
  Document the default scopes change on the release notes, CHANGELOG and upgrating guides
  Move changelog entry to the top, fix examples indent [ci skip]
  ...

1 files changed, 36 insertions, 0 deletions

diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md
index 342f670e78..b05aa21f95 100644
--- a/actionpack/CHANGELOG.md
+++ b/actionpack/CHANGELOG.md
@@ -1,3 +1,39 @@
+*   Introduce `render :html` as an option to render 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.
+
+    *Prem Sichanugrist*
+
+*   Introduce `render :plain` 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.
+
+    *Prem Sichanugrist*
+
+*   Introduce `render :body` as an option for sending a raw content back to
+    browser. Note that this rendering option will unset the default content type
+    and does not include "Content-Type" header back in the response.
+
+    You should only use this option if you are expecting the "Content-Type"
+    header to not be set. More information on "Content-Type" header can be found
+    on RFC 2616, section 7.2.1.
+
+    Please see #12374 for more detail.
+
+    *Prem Sichanugrist*
+
+*   Set stream status to 500 (or 400 on BadRequest) when an error is thrown
+    before commiting.
+
+    Fixes #12552.
+
+    *Kevin Casey*
+
 *   Add new config option `config.action_dispatch.cookies_serializer` for
     specifying a serializer for the signed and encrypted cookie jars.