actionpack 6.1.7.7 → 7.0.0.alpha1

data/CHANGELOG.md

@@ -1,169 +1,69 @@
-## Rails 6.1.7.7 (February 21, 2024) ##
+## Rails 7.0.0.alpha1 (September 15, 2021) ##
 
-*   No changes.
+*   Use a static error message when raising `ActionDispatch::Http::Parameters::ParseError`
+    to avoid inadvertently logging the HTTP request body at the `fatal` level when it contains
+    malformed JSON.
 
+    Fixes #41145
 
-## Rails 6.1.7.6 (August 22, 2023) ##
+    *Aaron Lahey*
 
-*   No changes.
+*   Add `Middleware#delete!` to delete middleware or raise if not found.
 
+    `Middleware#delete!` works just like `Middleware#delete` but will
+    raise an error if the middleware isn't found.
 
-## Rails 6.1.7.5 (August 22, 2023) ##
+    *Alex Ghiculescu*, *Petrik de Heus*, *Junichi Sato*
 
-*   No changes.
+*   Raise error on unpermitted open redirects.
 
+    Add `allow_other_host` options to `redirect_to`.
+    Opt in to this behaviour with `ActionController::Base.raise_on_open_redirects = true`.
 
-## Rails 6.1.7.4 (June 26, 2023) ##
-
-*   Raise an exception if illegal characters are provide to redirect_to
-    [CVE-2023-28362]
-
-    *Zack Deveau*
-
-## Rails 6.1.7.3 (March 13, 2023) ##
-
-*   No changes.
-
-
-## Rails 6.1.7.2 (January 24, 2023) ##
-
-*   Fix `domain: :all` for two letter TLD
-
-    This fixes a compatibility issue introduced in our previous security
-    release when using `domain: :all` with a two letter but single level top
-    level domain domain (like `.ca`, rather than `.co.uk`).
-
-
-## Rails 6.1.7.1 (January 17, 2023) ##
-
-*   Avoid regex backtracking on If-None-Match header
-
-    [CVE-2023-22795]
-
-*   Use string#split instead of regex for domain parts
-
-    [CVE-2023-22792]
-
-
-## Rails 6.1.7 (September 09, 2022) ##
-
-*   No changes.
-
-
-## Rails 6.1.6.1 (July 12, 2022) ##
-
-*   No changes.
-
-
-## Rails 6.1.6 (May 09, 2022) ##
-
-*   No changes.
-
-
-## Rails 6.1.5.1 (April 26, 2022) ##
-
-*   Allow Content Security Policy DSL to generate for API responses.
-
-    *Tim Wade*
-
-## Rails 6.1.5 (March 09, 2022) ##
-
-*   Fix `content_security_policy` returning invalid directives.
-
-    Directives such as `self`, `unsafe-eval` and few others were not
-    single quoted when the directive was the result of calling a lambda
-    returning an array.
-
-    ```ruby
-    content_security_policy do |policy|
-      policy.frame_ancestors lambda { [:self, "https://example.com"] }
-    end
-    ```
-
-    With this fix the policy generated from above will now be valid.
-
-    *Edouard Chin*
-
-*   Update `HostAuthorization` middleware to render debug info only
-    when `config.consider_all_requests_local` is set to true.
-
-    Also, blocked host info is always logged with level `error`.
-
-    Fixes #42813.
-
-    *Nikita Vyrko*
-
-*   Dup arrays that get "converted".
-
-    Fixes #43681.
-
-    *Aaron Patterson*
-
-*   Don't show deprecation warning for equal paths.
-
-    *Anton Rieder*
-
-*   Fix crash in `ActionController::Instrumentation` with invalid HTTP formats.
-
-    Fixes #43094.
-
-    *Alex Ghiculescu*
-
-*   Add fallback host for SystemTestCase driven by RackTest.
-
-    Fixes #42780.
-
-    *Petrik de Heus*
-
-*   Add more detail about what hosts are allowed.
-
-    *Alex Ghiculescu*
-
-
-## Rails 6.1.4.7 (March 08, 2022) ##
-
-*   No changes.
-
-
-## Rails 6.1.4.6 (February 11, 2022) ##
-
-*   No changes.
+    *Gannon McGibbon*
 
+*   Deprecate `poltergeist` and `webkit` (capybara-webkit) driver registration for system testing (they will be removed in Rails 7.1). Add `cuprite` instead.
 
-## Rails 6.1.4.5 (February 11, 2022) ##
+    [Poltergeist](https://github.com/teampoltergeist/poltergeist) and [capybara-webkit](https://github.com/thoughtbot/capybara-webkit) are already not maintained. These usage in Rails are removed for avoiding confusing users.
 
-*   Under certain circumstances, the middleware isn't informed that the
-    response body has been fully closed which result in request state not
-    being fully reset before the next request
+    [Cuprite](https://github.com/rubycdp/cuprite) is a good alternative to Poltergeist. Some guide descriptions are replaced from Poltergeist to Cuprite.
 
-    [CVE-2022-23633]
+    *Yusuke Iwaki*
 
+*   Exclude additional flash types from `ActionController::Base.action_methods`.
 
-## Rails 6.1.4.4 (December 15, 2021) ##
+    Ensures that additional flash types defined on ActionController::Base subclasses
+    are not listed as actions on that controller.
 
-*   Fix issue with host protection not allowing host with port in development.
+        class MyController < ApplicationController
+          add_flash_types :hype
+        end
 
+        MyController.action_methods.include?('hype') # => false
 
-## Rails 6.1.4.3 (December 14, 2021) ##
+    *Gavin Morrice*
 
-*    Fix issue with host protection not allowing localhost in development.
+*   OpenSSL constants are now used for Digest computations.
 
+    *Dirkjan Bussink*
 
-## Rails 6.1.4.2 (December 14, 2021) ##
+*   Remove IE6-7-8 file download related hack/fix from ActionController::DataStreaming module.
 
-*   Fix X_FORWARDED_HOST protection.  [CVE-2021-44528]
+    Due to the age of those versions of IE this fix is no longer relevant, more importantly it creates an edge-case for unexpected Cache-Control headers.
 
-## Rails 6.1.4.1 (August 19, 2021) ##
+    *Tadas Sasnauskas*
 
-*   [CVE-2021-22942] Fix possible open redirect in Host Authorization middleware.
+*   Configuration setting to skip logging an uncaught exception backtrace when the exception is
+    present in `rescued_responses`.
 
-    Specially crafted "X-Forwarded-Host" headers in combination with certain
-    "allowed host" formats can cause the Host Authorization middleware in Action
-    Pack to redirect users to a malicious website.
+    It may be too noisy to get all backtraces logged for applications that manage uncaught
+    exceptions via `rescued_responses` and `exceptions_app`.
+    `config.action_dispatch.log_rescued_responses` (defaults to `true`) can be set to `false` in
+    this case, so that only exceptions not found in `rescued_responses` will be logged.
 
-## Rails 6.1.4 (June 24, 2021) ##
+    *Alexander Azarov*, *Mike Dalessio*
 
-*   Ignore file fixtures on `db:fixtures:load`
+*   Ignore file fixtures on `db:fixtures:load`.
 
     *Kevin Sjöberg*
 
@@ -171,513 +71,123 @@
 
     *Dylan Thacker-Smith*
 
-*   Correctly place optional path parameter booleans.
-
-    Previously, if you specify a url parameter that is part of the path as false it would include that part
-    of the path as parameter for example:
-
-    ```
-    get "(/optional/:optional_id)/things" => "foo#foo", as: :things
-    things_path(optional_id: false) # => /things?optional_id=false
-    ```
-
-    After this change, true and false will be treated the same when used as optional path parameters. Meaning now:
-
-    ```
-    get '(this/:my_bool)/that' as: :that
-
-    that_path(my_bool: true) # => `/this/true/that`
-    that_path(my_bool: false) # => `/this/false/that`
-    ```
-
-    *Adam Hess*
-
-*   Add support for 'private, no-store' Cache-Control headers.
-
-    Previously, 'no-store' was exclusive; no other directives could be specified.
-
-    *Alex Smith*
-
-
-## Rails 6.1.3.2 (May 05, 2021) ##
-
-*   Prevent open redirects by correctly escaping the host allow list
-    CVE-2021-22903
-
-*   Prevent catastrophic backtracking during mime parsing
-    CVE-2021-22902
-
-*   Prevent regex DoS in HTTP token authentication
-    CVE-2021-22904
-
-*   Prevent string polymorphic route arguments.
-
-    `url_for` supports building polymorphic URLs via an array
-    of arguments (usually symbols and records). If a developer passes a
-    user input array, strings can result in unwanted route helper calls.
-
-    CVE-2021-22885
-
-    *Gannon McGibbon*
-
-## Rails 6.1.3.1 (March 26, 2021) ##
-
-*   No changes.
-
-
-## Rails 6.1.3 (February 17, 2021) ##
-
-*   Re-define routes when not set correctly via inheritance.
-
-    *John Hawthorn*
-
-
-## Rails 6.1.2.1 (February 10, 2021) ##
-
-*   Prevent open redirect when allowed host starts with a dot
-
-    [CVE-2021-22881]
-
-    Thanks to @tktech (https://hackerone.com/tktech) for reporting this
-    issue and the patch!
-
-    *Aaron Patterson*
-
-
-## Rails 6.1.2 (February 09, 2021) ##
-
-*   Fix error in `ActionController::LogSubscriber` that would happen when throwing inside a controller action.
-
-    *Janko Marohnić*
-
-*   Fix `fixture_file_upload` deprecation when `file_fixture_path` is a relative path.
-
-    *Eugene Kenny*
-
-
-## Rails 6.1.1 (January 07, 2021) ##
-
-*   Fix nil translation key lookup in controllers/
-
-    *Jan Klimo*
-
-*   Quietly handle unknown HTTP methods in Action Dispatch SSL middleware.
-
-    *Alex Robbin*
-
-*   Change the request method to a `GET` when passing failed requests down to `config.exceptions_app`.
-
-    *Alex Robbin*
-
-
-## Rails 6.1.0 (December 09, 2020) ##
-
-*   Support for the HTTP header `Feature-Policy` has been revised to reflect
-    its [rename](https://github.com/w3c/webappsec-permissions-policy/pull/379) to [`Permissions-Policy`](https://w3c.github.io/webappsec-permissions-policy/#permissions-policy-http-header-field).
-
-    ```ruby
-    Rails.application.config.permissions_policy do |p|
-      p.camera     :none
-      p.gyroscope  :none
-      p.microphone :none
-      p.usb        :none
-      p.fullscreen :self
-      p.payment    :self, "https://secure-example.com"
-    end
-    ```
-
-    *Julien Grillot*
-
-*   Allow `ActionDispatch::HostAuthorization` to exclude specific requests.
-
-    Host Authorization checks can be skipped for specific requests. This allows for health check requests to be permitted for requests with missing or non-matching host headers.
-
-    *Chris Bisnett*
-
-*   Add `config.action_dispatch.request_id_header` to allow changing the name of
-    the unique X-Request-Id header
-
-    *Arlston Fernandes*
-
-*   Deprecate `config.action_dispatch.return_only_media_type_on_content_type`.
-
-    *Rafael Mendonça França*
-
-*   Change `ActionDispatch::Response#content_type` to return the full Content-Type header.
-
-    *Rafael Mendonça França*
-
-*   Remove deprecated `ActionDispatch::Http::ParameterFilter`.
-
-    *Rafael Mendonça França*
-
-*   Added support for exclusive no-store Cache-Control header.
+*   New `ActionController::ConditionalGet#no_store` method to set HTTP cache control `no-store` directive.
 
-    If `no-store` is set on Cache-Control header it is exclusive (all other cache directives are dropped).
+    *Tadas Sasnauskas*
 
-    *Chris Kruger*
+*   Drop support for the `SERVER_ADDR` header.
 
-*   Catch invalid UTF-8 parameters for POST requests and respond with BadRequest.
+    Following up https://github.com/rack/rack/pull/1573 and https://github.com/rails/rails/pull/42349.
 
-    Additionally, perform `#set_binary_encoding` in `ActionDispatch::Http::Request#GET` and
-    `ActionDispatch::Http::Request#POST` prior to validating encoding.
+    *Ricardo Díaz*
 
-    *Adrianna Chang*
-
-*   Allow `assert_recognizes` routing assertions to work on mounted root routes.
+*   Set session options when initializing a basic session.
 
     *Gannon McGibbon*
 
-*   Change default redirection status code for non-GET/HEAD requests to 308 Permanent Redirect for `ActionDispatch::SSL`.
-
-    *Alan Tan*, *Oz Ben-David*
-
-*   Fix `follow_redirect!` to follow redirection with same HTTP verb when following
-    a 308 redirection.
-
-    *Alan Tan*
-
-*   When multiple domains are specified for a cookie, a domain will now be
-    chosen only if it is equal to or is a superdomain of the request host.
-
-    *Jonathan Hefner*
-
-*   `ActionDispatch::Static` handles precompiled Brotli (.br) files.
-
-    Adds to existing support for precompiled gzip (.gz) files.
-    Brotli files are preferred due to much better compression.
-
-    When the browser requests /some.js with `Accept-Encoding: br`,
-    we check for public/some.js.br and serve that file, if present, with
-    `Content-Encoding: br` and `Vary: Accept-Encoding` headers.
-
-    *Ryan Edward Hall*, *Jeremy Daer*
-
-*   Add raise_on_missing_translations support for controllers.
-
-    This configuration determines whether an error should be raised for missing translations.
-    It can be enabled through `config.i18n.raise_on_missing_translations`. Note that described
-    configuration also affects raising error for missing translations in views.
-
-    *fatkodima*
-
-*   Added `compact` and `compact!` to `ActionController::Parameters`.
-
-    *Eugene Kenny*
-
-*   Calling `each_pair` or `each_value` on an `ActionController::Parameters`
-    without passing a block now returns an enumerator.
-
-    *Eugene Kenny*
-
-*   `fixture_file_upload` now uses path relative to `file_fixture_path`
-
-    Previously the path had to be relative to `fixture_path`.
-    You can change your existing code as follow:
-
-    ```ruby
-    # Before
-    fixture_file_upload('files/dog.png')
-
-    # After
-    fixture_file_upload('dog.png')
-    ```
-
-    *Edouard Chin*
-
-*   Remove deprecated `force_ssl` at the controller level.
-
-    *Rafael Mendonça França*
-
-*   The +helper+ class method for controllers loads helper modules specified as
-    strings/symbols with `String#constantize` instead of `require_dependency`.
-
-    Remember that support for strings/symbols is only a convenient API. You can
-    always pass a module object:
-
-    ```ruby
-    helper UtilsHelper
-    ```
-
-    which is recommended because it is simple and direct. When a string/symbol
-    is received, `helper` just manipulates and inflects the argument to obtain
-    that same module object.
-
-    *Xavier Noria*, *Jean Boussier*
-
-*   Correctly identify the entire localhost IPv4 range as trusted proxy.
-
-    *Nick Soracco*
-
-*   `url_for` will now use "https://" as the default protocol when
-    `Rails.application.config.force_ssl` is set to true.
-
-    *Jonathan Hefner*
-
-*   Accept and default to base64_urlsafe CSRF tokens.
-
-    Base64 strict-encoded CSRF tokens are not inherently websafe, which makes
-    them difficult to deal with. For example, the common practice of sending
-    the CSRF token to a browser in a client-readable cookie does not work properly
-    out of the box: the value has to be url-encoded and decoded to survive transport.
-
-    Now, we generate Base64 urlsafe-encoded CSRF tokens, which are inherently safe
-    to transport. Validation accepts both urlsafe tokens, and strict-encoded tokens
-    for backwards compatibility.
-
-    *Scott Blum*
-
-*   Support rolling deploys for cookie serialization/encryption changes.
-
-    In a distributed configuration like rolling update, users may observe
-    both old and new instances during deployment. Users may be served by a
-    new instance and then by an old instance.
-
-    That means when the server changes `cookies_serializer` from `:marshal`
-    to `:hybrid` or the server changes `use_authenticated_cookie_encryption`
-    from `false` to `true`, users may lose their sessions if they access the
-    server during deployment.
-
-    We added fallbacks to downgrade the cookie format when necessary during
-    deployment, ensuring compatibility on both old and new instances.
-
-    *Masaki Hara*
+*   Add `cache_control: {}` option to `fresh_when` and `stale?`.
 
-*   `ActionDispatch::Request.remote_ip` has ip address even when all sites are trusted.
+    Works as a shortcut to set `response.cache_control` with the above methods.
 
-    Before, if all `X-Forwarded-For` sites were trusted, the `remote_ip` would default to `127.0.0.1`.
-    Now, the furthest proxy site is used. e.g.: It now gives an ip address when using curl from the load balancer.
+    *Jacopo Beschi*
 
-    *Keenan Brock*
+*   Writing into a disabled session will now raise an error.
 
-*   Fix possible information leak / session hijacking vulnerability.
+    Previously when no session store was set, writing into the session would silently fail.
 
-    The `ActionDispatch::Session::MemcacheStore` is still vulnerable given it requires the
-    gem dalli to be updated as well.
+    *Jean Boussier*
 
-    CVE-2019-16782.
+*   Add support for 'require-trusted-types-for' and 'trusted-types' headers.
 
-*   Include child session assertion count in ActionDispatch::IntegrationTest.
+    Fixes #42034.
 
-    `IntegrationTest#open_session` uses `dup` to create the new session, which
-    meant it had its own copy of `@assertions`. This prevented the assertions
-    from being correctly counted and reported.
+    *lfalcao*
 
-    Child sessions now have their `attr_accessor` overridden to delegate to the
-    root session.
+*   Remove inline styles and address basic accessibility issues on rescue templates.
 
-    Fixes #32142.
+    *Jacob Herrington*
 
-    *Sam Bostock*
-
-*   Add SameSite protection to every written cookie.
-
-    Enabling `SameSite` cookie protection is an addition to CSRF protection,
-    where cookies won't be sent by browsers in cross-site POST requests when set to `:lax`.
-
-    `:strict` disables cookies being sent in cross-site GET or POST requests.
-
-    Passing `:none` disables this protection and is the same as previous versions albeit a `; SameSite=None` is appended to the cookie.
-
-    See upgrade instructions in config/initializers/new_framework_defaults_6_1.rb.
+*   Add support for 'private, no-store' Cache-Control headers.
 
-    More info [here](https://tools.ietf.org/html/draft-west-first-party-cookies-07)
+    Previously, 'no-store' was exclusive; no other directives could be specified.
 
-    _NB: Technically already possible as Rack supports SameSite protection, this is to ensure it's applied to all cookies_
+    *Alex Smith*
 
-    *Cédric Fabianski*
+*   Expand payload of `unpermitted_parameters.action_controller` instrumentation to allow subscribers to
+    know which controller action received unpermitted parameters.
 
-*   Bring back the feature that allows loading external route files from the router.
+    *bbuchalter*
 
-    This feature existed back in 2012 but got reverted with the incentive that
-    https://github.com/rails/routing_concerns was a better approach. Turned out
-    that this wasn't fully the case and loading external route files from the router
-    can be helpful for applications with a really large set of routes.
-    Without this feature, application needs to implement routes reloading
-    themselves and it's not straightforward.
+*   Add `ActionController::Live#send_stream` that makes it more convenient to send generated streams:
 
     ```ruby
-    # config/routes.rb
-
-    Rails.application.routes.draw do
-      draw(:admin)
-    end
-
-    # config/routes/admin.rb
-
-    get :foo, to: 'foo#bar'
-    ```
-
-    *Yehuda Katz*, *Edouard Chin*
-
-*   Fix system test driver option initialization for non-headless browsers.
-
-    *glaszig*
+    send_stream(filename: "subscribers.csv") do |stream|
+      stream.writeln "email_address,updated_at"
 
-*   `redirect_to.action_controller` notifications now include the `ActionDispatch::Request` in
-    their payloads as `:request`.
-
-    *Austin Story*
-
-*   `respond_to#any` no longer returns a response's Content-Type based on the
-    request format but based on the block given.
-
-    Example:
-
-    ```ruby
-      def my_action
-        respond_to do |format|
-          format.any { render(json: { foo: 'bar' }) }
-        end
+      @subscribers.find_each do |subscriber|
+        stream.writeln [ subscriber.email_address, subscriber.updated_at ].join(",")
       end
-
-      get('my_action.csv')
-    ```
-
-    The previous behaviour was to respond with a `text/csv` Content-Type which
-    is inaccurate since a JSON response is being rendered.
-
-    Now it correctly returns a `application/json` Content-Type.
-
-    *Edouard Chin*
-
-*   Replaces (back)slashes in failure screenshot image paths with dashes.
-
-    If a failed test case contained a slash or a backslash, a screenshot would be created in a
-    nested directory, causing issues with `tmp:clear`.
-
-    *Damir Zekic*
-
-*   Add `params.member?` to mimic Hash behavior.
-
-    *Younes Serraj*
-
-*   `process_action.action_controller` notifications now include the following in their payloads:
-
-    * `:request` - the `ActionDispatch::Request`
-    * `:response` - the `ActionDispatch::Response`
-
-    *George Claghorn*
-
-*   Updated `ActionDispatch::Request.remote_ip` setter to clear set the instance
-    `remote_ip` to `nil` before setting the header that the value is derived
-    from.
-
-    Fixes #37383.
-
-    *Norm Provost*
-
-*   `ActionController::Base.log_at` allows setting a different log level per request.
-
-    ```ruby
-    # Use the debug level if a particular cookie is set.
-    class ApplicationController < ActionController::Base
-      log_at :debug, if: -> { cookies[:debug] }
     end
     ```
 
-    *George Claghorn*
-
-*   Allow system test screen shots to be taken more than once in
-    a test by prefixing the file name with an incrementing counter.
-
-    Add an environment variable `RAILS_SYSTEM_TESTING_SCREENSHOT_HTML` to
-    enable saving of HTML during a screenshot in addition to the image.
-    This uses the same image name, with the extension replaced with `.html`
-
-    *Tom Fakes*
-
-*   Add `Vary: Accept` header when using `Accept` header for response.
-
-    For some requests like `/users/1`, Rails uses requests' `Accept`
-    header to determine what to return. And if we don't add `Vary`
-    in the response header, browsers might accidentally cache different
-    types of content, which would cause issues: e.g. javascript got displayed
-    instead of html content. This PR fixes these issues by adding `Vary: Accept`
-    in these types of requests. For more detailed problem description, please read:
-
-    https://github.com/rails/rails/pull/36213
+    *DHH*
 
-    Fixes #25842.
+*   Add `ActionController::Live::Buffer#writeln` to write a line to the stream with a newline included.
 
-    *Stan Lo*
+    *DHH*
 
-*   Fix IntegrationTest `follow_redirect!` to follow redirection using the same HTTP verb when following
-    a 307 redirection.
+*   `ActionDispatch::Request#content_type` now returned Content-Type header as it is.
 
-    *Edouard Chin*
+    Previously, `ActionDispatch::Request#content_type` returned value does NOT contain charset part.
+    This behavior changed to returned Content-Type header containing charset part as it is.
 
-*   System tests require Capybara 3.26 or newer.
+    If you want just MIME type, please use `ActionDispatch::Request#media_type` instead.
 
-    *George Claghorn*
-
-*   Reduced log noise handling ActionController::RoutingErrors.
-
-    *Alberto Fernández-Capel*
-
-*   Add DSL for configuring HTTP Feature Policy.
-
-    This new DSL provides a way to configure an HTTP Feature Policy at a
-    global or per-controller level. Full details of HTTP Feature Policy
-    specification and guidelines can be found at MDN:
-
-    https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Feature-Policy
-
-    Example global policy:
+    Before:
 
     ```ruby
-    Rails.application.config.feature_policy do |f|
-      f.camera      :none
-      f.gyroscope   :none
-      f.microphone  :none
-      f.usb         :none
-      f.fullscreen  :self
-      f.payment     :self, "https://secure.example.com"
-    end
+    request = ActionDispatch::Request.new("CONTENT_TYPE" => "text/csv; header=present; charset=utf-16", "REQUEST_METHOD" => "GET")
+    request.content_type #=> "text/csv"
     ```
 
-    Example controller level policy:
+    After:
 
     ```ruby
-    class PagesController < ApplicationController
-      feature_policy do |p|
-        p.geolocation "https://example.com"
-      end
-    end
+    request = ActionDispatch::Request.new("Content-Type" => "text/csv; header=present; charset=utf-16", "REQUEST_METHOD" => "GET")
+    request.content_type #=> "text/csv; header=present; charset=utf-16"
+    request.media_type   #=> "text/csv"
     ```
 
-    *Jacob Bednarz*
+    *Rafael Mendonça França*
 
-*   Add the ability to set the CSP nonce only to the specified directives.
+*   Change `ActionDispatch::Request#media_type` to return `nil` when the request don't have a `Content-Type` header.
 
-    Fixes #35137.
+    *Rafael Mendonça França*
 
-    *Yuji Yaginuma*
+*   Fix error in `ActionController::LogSubscriber` that would happen when throwing inside a controller action.
 
-*   Keep part when scope option has value.
+    *Janko Marohnić*
 
-    When a route was defined within an optional scope, if that route didn't
-    take parameters the scope was lost when using path helpers. This commit
-    ensures scope is kept both when the route takes parameters or when it
-    doesn't.
+*   Allow anything with `#to_str` (like `Addressable::URI`) as a `redirect_to` location.
 
-    Fixes #33219.
+    *ojab*
 
-    *Alberto Almagro*
+*   Change the request method to a `GET` when passing failed requests down to `config.exceptions_app`.
 
-*   Added `deep_transform_keys` and `deep_transform_keys!` methods to ActionController::Parameters.
+    *Alex Robbin*
 
-    *Gustavo Gutierrez*
+*   Deprecate the ability to assign a single value to `config.action_dispatch.trusted_proxies`
+    as `RemoteIp` middleware behaves inconsistently depending on whether this is configured
+    with a single value or an enumerable.
 
-*   Calling `ActionController::Parameters#transform_keys`/`!` without a block now returns
-    an enumerator for the parameters instead of the underlying hash.
+    Fixes #40772.
 
-    *Eugene Kenny*
+    *Christian Sutter*
 
-*   Fix strong parameters blocks all attributes even when only some keys are invalid (non-numerical).
-    It should only block invalid key's values instead.
+*   Add `redirect_back_or_to(fallback_location, **)` as a more aesthetically pleasing version of `redirect_back fallback_location:, **`.
+    The old method name is retained without explicit deprecation.
 
-    *Stan Lo*
+    *DHH*
 
 
-Please check [6-0-stable](https://github.com/rails/rails/blob/6-0-stable/actionpack/CHANGELOG.md) for previous changes.
+Please check [6-1-stable](https://github.com/rails/rails/blob/6-1-stable/actionpack/CHANGELOG.md) for previous changes.