Release v4.9.4

Adds Ruby 3.3 to CI on 4-stable
Related: #5668
2026-01-12 00:58:54 -05:00 · 2024-04-10 09:27:12 -03:00 · 2024-04-09 17:12:52 -03:00 · 2024-04-09 16:58:42 -03:00 · 2023-10-13 11:57:29 -03:00 · 2023-10-13 11:19:45 -03:00
100 changed files with 1728 additions and 748 deletions
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -1,25 +0,0 @@
-// For format details, see https://aka.ms/devcontainer.json. For config options, see the
-// README at: https://github.com/devcontainers/templates/tree/main/src/ruby
-{
-	"name": "Ruby",
-	// Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
-	"image": "mcr.microsoft.com/devcontainers/ruby:0-3-bullseye",
-	"features": {
-		"ghcr.io/devcontainers/features/github-cli:1": {}
-	},
-
-	// Features to add to the dev container. More info: https://containers.dev/features.
-	// "features": {},
-
-	// Use 'forwardPorts' to make a list of ports inside the container available locally.
-	// "forwardPorts": [],
-
-	// Use 'postCreateCommand' to run commands after the container is created.
-	"postCreateCommand": "bundle install",
-
-	// Configure tool-specific properties.
-	// "customizations": {},
-
-	// Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root.
-	// "remoteUser": "root"
-}
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -1,6 +0,0 @@
-version: 2
-updates:
-  - package-ecosystem: "github-actions"
-    directory: "/"
-    schedule:
-      interval: "weekly"
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -9,55 +9,195 @@ jobs:
          - Gemfile
          - gemfiles/Gemfile-rails-main
          - gemfiles/Gemfile-rails-7-0
-          - gemfiles/Gemfile-rails-7-1
-          - gemfiles/Gemfile-rails-7-2
-          - gemfiles/Gemfile-rails-8-0
+          - gemfiles/Gemfile-rails-6-1
+          - gemfiles/Gemfile-rails-6-0
+          - gemfiles/Gemfile-rails-5-2
+          - gemfiles/Gemfile-rails-5-1
+          - gemfiles/Gemfile-rails-5-0
+          - gemfiles/Gemfile-rails-4-2
+          - gemfiles/Gemfile-rails-4-1
        ruby:
-          - '4.0'
-          - '3.4'
          - '3.3'
          - '3.2'
          - '3.1'
          - '3.0'
          - '2.7'
-        orm:
-          - active_record
-          - mongoid
+          - '2.6'
+          - '2.5'
+          - '2.4'
+          - '2.3'
+          - '2.2'
+          - '2.1'
+        env:
+          - DEVISE_ORM=active_record
+          - DEVISE_ORM=mongoid
        exclude:
-          - gemfile: Gemfile
-            ruby: '3.1'
-          - gemfile: Gemfile
-            ruby: '3.0'
-          - gemfile: Gemfile
-            ruby: '2.7'
          - gemfile: gemfiles/Gemfile-rails-main
+            ruby: '2.7' # Rails > 7.1 supports Ruby >= 3.1
+          - gemfile: gemfiles/Gemfile-rails-main
+            ruby: '3.0' # Rails > 7.1 supports Ruby >= 3.1
+          - gemfile: Gemfile
+            ruby: '2.6'
+          - gemfile: Gemfile
+            ruby: '2.5'
+          - gemfile: Gemfile
+            ruby: '2.4'
+          - gemfile: Gemfile
+            ruby: '2.3'
+          - gemfile: Gemfile
+            ruby: '2.2'
+          - gemfile: Gemfile
+            ruby: '2.1'
+          - gemfile: Gemfile
+            env: DEVISE_ORM=mongoid
+          - gemfile: gemfiles/Gemfile-rails-main
+            ruby: '2.6'
+          - gemfile: gemfiles/Gemfile-rails-main
+            ruby: '2.5'
+          - gemfile: gemfiles/Gemfile-rails-main
+            ruby: '2.4'
+          - gemfile: gemfiles/Gemfile-rails-main
+            ruby: '2.3'
+          - gemfile: gemfiles/Gemfile-rails-main
+            ruby: '2.2'
+          - gemfile: gemfiles/Gemfile-rails-main
+            ruby: '2.1'
+          - gemfile: gemfiles/Gemfile-rails-main
+            env: DEVISE_ORM=mongoid
+          - gemfile: gemfiles/Gemfile-rails-7-0
+            ruby: '2.6'
+          - gemfile: gemfiles/Gemfile-rails-7-0
+            ruby: '2.5'
+          - gemfile: gemfiles/Gemfile-rails-7-0
+            ruby: '2.4'
+          - gemfile: gemfiles/Gemfile-rails-7-0
+            ruby: '2.3'
+          - gemfile: gemfiles/Gemfile-rails-7-0
+            ruby: '2.2'
+          - gemfile: gemfiles/Gemfile-rails-7-0
+            ruby: '2.1'
+          - gemfile: gemfiles/Gemfile-rails-7-0
+            env: DEVISE_ORM=mongoid
+          - gemfile: gemfiles/Gemfile-rails-6-1
+            ruby: '2.4'
+          - gemfile: gemfiles/Gemfile-rails-6-1
+            ruby: '2.3'
+          - gemfile: gemfiles/Gemfile-rails-6-1
+            ruby: '2.2'
+          - gemfile: gemfiles/Gemfile-rails-6-1
+            ruby: '2.1'
+          - gemfile: gemfiles/Gemfile-rails-6-1
+            env: DEVISE_ORM=mongoid
+          - gemfile: gemfiles/Gemfile-rails-6-0
+            ruby: '3.3'
+          - gemfile: gemfiles/Gemfile-rails-6-0
            ruby: '3.2'
-          - gemfile: gemfiles/Gemfile-rails-main
+          - gemfile: gemfiles/Gemfile-rails-6-0
            ruby: '3.1'
-          - gemfile: gemfiles/Gemfile-rails-main
-            ruby: '3.0'
-          - gemfile: gemfiles/Gemfile-rails-main
-            ruby: '2.7'
-          - gemfile: gemfiles/Gemfile-rails-8-0
+          - gemfile: gemfiles/Gemfile-rails-6-0
+            ruby: '2.4'
+          - gemfile: gemfiles/Gemfile-rails-6-0
+            ruby: '2.3'
+          - gemfile: gemfiles/Gemfile-rails-6-0
+            ruby: '2.2'
+          - gemfile: gemfiles/Gemfile-rails-6-0
+            ruby: '2.1'
+          - gemfile: gemfiles/Gemfile-rails-6-0
+            env: DEVISE_ORM=mongoid
+          - gemfile: gemfiles/Gemfile-rails-5-2
+            ruby: '3.3'
+          - gemfile: gemfiles/Gemfile-rails-5-2
+            ruby: '3.2'
+          - gemfile: gemfiles/Gemfile-rails-5-2
            ruby: '3.1'
-          - gemfile: gemfiles/Gemfile-rails-8-0
+          - gemfile: gemfiles/Gemfile-rails-5-2
            ruby: '3.0'
-          - gemfile: gemfiles/Gemfile-rails-8-0
+          - gemfile: gemfiles/Gemfile-rails-5-2
            ruby: '2.7'
-          - gemfile: gemfiles/Gemfile-rails-7-2
+          - gemfile: gemfiles/Gemfile-rails-5-2
+            ruby: '2.2'
+          - gemfile: gemfiles/Gemfile-rails-5-2
+            ruby: '2.1'
+          - gemfile: gemfiles/Gemfile-rails-5-2
+            env: DEVISE_ORM=mongoid
+          - gemfile: gemfiles/Gemfile-rails-5-1
+            ruby: '3.3'
+          - gemfile: gemfiles/Gemfile-rails-5-1
+            ruby: '3.2'
+          - gemfile: gemfiles/Gemfile-rails-5-1
+            ruby: '3.1'
+          - gemfile: gemfiles/Gemfile-rails-5-1
            ruby: '3.0'
-          - gemfile: gemfiles/Gemfile-rails-7-2
+          - gemfile: gemfiles/Gemfile-rails-5-1
            ruby: '2.7'
-    runs-on: ubuntu-latest
+          - gemfile: gemfiles/Gemfile-rails-5-1
+            ruby: '2.1'
+          - gemfile: gemfiles/Gemfile-rails-5-1
+            env: DEVISE_ORM=mongoid
+          - gemfile: gemfiles/Gemfile-rails-5-0
+            ruby: '3.3'
+          - gemfile: gemfiles/Gemfile-rails-5-0
+            ruby: '3.2'
+          - gemfile: gemfiles/Gemfile-rails-5-0
+            ruby: '3.1'
+          - gemfile: gemfiles/Gemfile-rails-5-0
+            ruby: '3.0'
+          - gemfile: gemfiles/Gemfile-rails-5-0
+            ruby: '2.7'
+          - gemfile: gemfiles/Gemfile-rails-5-0
+            ruby: '2.1'
+          - gemfile: gemfiles/Gemfile-rails-5-0
+            env: DEVISE_ORM=mongoid
+          - gemfile: gemfiles/Gemfile-rails-4-2
+            ruby: '3.3'
+          - gemfile: gemfiles/Gemfile-rails-4-2
+            ruby: '3.2'
+          - gemfile: gemfiles/Gemfile-rails-4-2
+            ruby: '3.1'
+          - gemfile: gemfiles/Gemfile-rails-4-2
+            ruby: '3.0'
+          - gemfile: gemfiles/Gemfile-rails-4-2
+            ruby: '2.7'
+          - gemfile: gemfiles/Gemfile-rails-4-2
+            ruby: '2.6'
+          - gemfile: gemfiles/Gemfile-rails-4-1
+            ruby: '3.3'
+          - gemfile: gemfiles/Gemfile-rails-4-1
+            ruby: '3.2'
+          - gemfile: gemfiles/Gemfile-rails-4-1
+            ruby: '3.1'
+          - gemfile: gemfiles/Gemfile-rails-4-1
+            ruby: '3.0'
+          - gemfile: gemfiles/Gemfile-rails-4-1
+            ruby: '2.7'
+          - gemfile: gemfiles/Gemfile-rails-4-1
+            ruby: '2.6'
+          - gemfile: gemfiles/Gemfile-rails-4-1
+            ruby: '2.5'
+          - gemfile: gemfiles/Gemfile-rails-4-1
+            ruby: '2.4'
+    # TODO: lock `ubunty-20.04` due to older Ruby version compatibility, change to `ubuntu-latest` again when dropping older Ruby support.
+    # https://github.com/ruby/setup-ruby/issues/496#issuecomment-1520662740
+    runs-on: ubuntu-20.04
    env: # $BUNDLE_GEMFILE must be set at the job level, so it is set for all steps
      BUNDLE_GEMFILE: ${{ matrix.gemfile }}
-      DEVISE_ORM: ${{ matrix.orm }}
    steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v3
+      - name: Setup Bundler 1.x for Rails 4.x and Ruby <= 2.2
+        if: ${{ matrix.gemfile == 'gemfiles/Gemfile-rails-4-1' || matrix.gemfile == 'gemfiles/Gemfile-rails-4-2' || matrix.ruby <= '2.2' }}
+        run: echo "BUNDLER_VERSION=1.17.3" >> $GITHUB_ENV
+      - name: Setup Rubygems version as default for Ruby < 2.5
+        if: ${{ matrix.ruby < '2.5' }}
+        run: echo "RUBYGEMS_VERSION=default" >> $GITHUB_ENV
+      - name: Setup Rubygems version as 3.2.3 for Ruby 2.5
+        if: ${{ matrix.ruby == '2.5' }}
+        run: echo "RUBYGEMS_VERSION=3.2.3" >> $GITHUB_ENV
      - uses: ruby/setup-ruby@v1
        with:
          ruby-version: ${{ matrix.ruby }}
          bundler-cache: true # runs bundle install and caches installed gems automatically
-      - uses: supercharge/mongodb-github-action@1.12.1
-        if: ${{ matrix.orm == 'mongoid' }}
+          bundler: ${{ env.BUNDLER_VERSION || 'default' }}
+          rubygems: ${{ env.RUBYGEMS_VERSION || 'latest' }}
+      - uses: supercharge/mongodb-github-action@1.3.0
+        if: ${{ matrix.env == 'DEVISE_ORM=mongoid' }}
      - run: bundle exec rake
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,62 +1,410 @@
-### 5.0.0.rc - 2025-12-31
-
-* breaking changes
-  * Drop support to Ruby < 2.7
-  * Drop support to Rails < 7.0
-  * Remove deprecated `:bypass` option from `sign_in` helper, use `bypass_sign_in` instead. [#5803](https://github.com/heartcombo/devise/pull/5803)
-  * Remove deprecated `devise_error_messages!` helper, use `render "devise/shared/error_messages", resource: resource` instead. [#5803](https://github.com/heartcombo/devise/pull/5803)
-  * Remove deprecated `scope` second argument from `sign_in(resource, :admin)` controller test helper, use `sign_in(resource, scope: :admin)` instead. [#5803](https://github.com/heartcombo/devise/pull/5803)
-  * Remove deprecated `Devise::TestHelpers`, use `Devise::Test::ControllerHelpers` instead. [#5803](https://github.com/heartcombo/devise/pull/5803)
-  * Remove deprecated `Devise::Models::Authenticatable::BLACKLIST_FOR_SERIALIZATION` [#5598](https://github.com/heartcombo/devise/pull/5598)
-  * Remove deprecated `Devise.activerecord51?` method.
-  * Remove `SecretKeyFinder` and use `app.secret_key_base` as the default secret key for `Devise.secret_key` if a custom `Devise.secret_key` is not provided.
-
-    This is potentially a breaking change because Devise previously used the following order to find a secret key:
-
-    ```
-    app.credentials.secret_key_base > app.secrets.secret_key_base > application.config.secret_key_base > application.secret_key_base
-    ```
-
-    Now, it always uses `application.secret_key_base`. Make sure you're using the same secret key after the upgrade; otherwise, previously generated tokens for `recoverable`, `lockable`, and `confirmable` will be invalid.
-    [#5645](https://github.com/heartcombo/devise/pull/5645)
-  * Change password instructions button label on devise view from `Send me reset password instructions` to `Send me password reset instructions` [#5515](https://github.com/heartcombo/devise/pull/5515)
-  * Change `<br>` tags separating form elements to wrapping them in `<p>` tags [#5494](https://github.com/heartcombo/devise/pull/5494)
-  * Replace `[data-turbo-cache=false]` with `[data-turbo-temporary]` on `devise/shared/error_messages` partial. This has been [deprecated by Turbo since v7.3.0 (released on Mar 1, 2023)](https://github.com/hotwired/turbo/releases/tag/v7.3.0).
-
-    If you are using an older version of Turbo and the default devise template, you'll need to copy it over to your app and change that back to `[data-turbo-cache=false]`.
+### 4.9.4 - 2024-04-10

 * enhancements
-  * Add Rails 8 support.
-    - Routes are lazy-loaded by default in test and development environments now so Devise loads them before `Devise.mappings` call. [#5728](https://github.com/heartcombo/devise/pull/5728)
-  * New apps using Rack 3.1+ will be generated using `config.responder.error_status = :unprocessable_content`, since [`:unprocessable_entity` has been deprecated by Rack](https://github.com/rack/rack/pull/2137).
-
-    Latest versions of [Rails transparently convert `:unprocessable_entity` -> `:unprocessable_content`](https://github.com/rails/rails/pull/53383), and Devise will use that in the failure app to avoid Rack deprecation warnings for apps that are configured with `:unprocessable_entity`. They can also simply change their `error_status` to `:unprocessable_content` in latest Rack versions to avoid the warning.
-  * Add Ruby 3.4 and 4.0 support.
-  * Reenable Mongoid test suite across all Rails 7+ versions, to ensure we continue supporting it. Changes to dirty tracking to support Mongoid 8.0+. [#5568](https://github.com/heartcombo/devise/pull/5568)
-  * Password length validator is changed from
-
-    ```
-    validates_length_of :password, within: password_length, allow_blank: true`
-    ```
-
-    to
-
-    ```
-    validates_length_of :password, minimum: proc { password_length.min }, maximum: proc { password_length.max }, allow_blank: true
-    ```
-
-    so it's possible to override `password_length` at runtime. [#5734](https://github.com/heartcombo/devise/pull/5734)
+  * Add support for Ruby 3.3. (no changes needed)

 * bug fixes
-  * Make `Devise` work without `ActionMailer` when `Zeitwerk` autoloader is used. [#5731](https://github.com/heartcombo/devise/pull/5731)
-  * Handle defaults `:from` and `:reply_to` as procs correctly by delegating to Rails [#5595](https://github.com/heartcombo/devise/pull/5595)
-  * Use `OmniAuth.config.allowed_request_methods` as routing verbs for the auth path [#5508](https://github.com/heartcombo/devise/pull/5508)
-  * Handle `on` and `ON` as true values to check params [#5514](https://github.com/heartcombo/devise/pull/5514)
-  * Fix passing `format` option to `devise_for` [#5732](https://github.com/heartcombo/devise/pull/5732)
-  * Use `ActiveRecord::SecurityUtils.secure_compare` in `Devise.secure_compare` to match two empty strings correctly. [#4829](https://github.com/heartcombo/devise/pull/4829)
-  * Respond with `401 Unauthorized` for non-navigational requests to destroy the session when there is no authenticated resource. [#4878](https://github.com/heartcombo/devise/pull/4878)
-  * Fix incorrect grammar of invalid authentication message with capitalized attributes, e.g.: "Invalid Email or password" => "Invalid email or password". (originally introduced by [#4014](https://github.com/heartcombo/devise/pull/4014), released on v4.1.0) [#4834](https://github.com/heartcombo/devise/pull/4834)
+  * Respect locale set by controller in failure app. Devise will carry over the current I18n.locale option when triggering authentication, and will wrap the failure app call with it. [#5567](https://github.com/heartcombo/devise/pull/5567)
+
+### 4.9.3 - 2023-10-11
+
+* enhancements
+  * Add support for Rails 7.1.
+  * Add `Devise.deprecator` to integrate with new application deprecators in Rails 7.1. (@soartec-lab, @etiennebarrie)
+
+### 4.9.2 - 2023-04-03
+
+* deprecations
+  * Bring back `Devise.activerecord51?` and deprecate it, in order to avoid breakage with some libraries that apparently relied on it.
+
+### 4.9.1 - 2023-03-31
+
+* enhancements
+  * Allow resource class scopes to override the global configuration for `sign_in_after_reset_password` behaviour. [#5429](https://github.com/heartcombo/devise/pull/5429) [@mattr](https://github.com/mattr)
+  * Refactor conditional dirty tracking logic to a centralized module to simplify usage throughout the codebase. [#5575](https://github.com/heartcombo/devise/pull/5575)
+  * Improve support for Devise in apps with Active Record and Mongoid ORMs loaded, so it does not incorrectly uses new Active Record dirty tracking APIs with a Mongoid Devise model. [#5576](https://github.com/heartcombo/devise/pull/5576)
+
+* bug fixes
+  * Failure app will respond with configured `redirect_status` instead of `error_status` if the recall app returns a redirect status (300..399) [#5573](https://github.com/heartcombo/devise/pull/5573)
+  * Fix frozen string exception in validatable. [#5563](https://github.com/heartcombo/devise/pull/5563) [#5465](https://github.com/heartcombo/devise/pull/5465) [@mameier](https://github.com/mameier)
+
+### 4.9.0 - 2023-02-17
+
+* enhancements
+  * Add support for Ruby 3.1/3.2.
+  * Add support for Hotwire + Turbo, default in Rails 7+.
+    * Devise uses the latest `responders` version (v3.1.0 or higher), which allows configuring the status used for validation error responses (`error_status`) and for redirects after POST/PUT/PATCH/DELETE requests (`redirect_status`). For backwards compatibility, Devise keeps `error_status` as `:ok` which returns a `200 OK` response, and `redirect_status` to `:found` which returns a `302 Found` response, but you can configure it to return `422 Unprocessable Entity` and `303 See Other` respectively, to match the behavior expected by Hotwire/Turbo:
+
+      ```ruby
+      # config/initializers/devise.rb
+      Devise.setup do |config|
+        # ...
+        config.responder.error_status = :unprocessable_entity
+        config.responder.redirect_status = :see_other
+        # ...
+      end
+      ```
+
+      These configs are already generated by default with new apps, and existing apps may opt-in as described above. Trying to set these with an older version of `responders` will issue a warning and have no effect, so please upgrade the `responders` version if you're upgrading Devise for this integration. Note that these defaults may change in future versions of Devise, to better match the Rails + Hotwire/Turbo defaults across the board.
+    * If you have a custom responder set on your application and expect it to affect Devise as well, you may need to override the Devise responder entirely with `config.responder = MyApplicationResponder`, so that it uses your custom one. The main reason Devise uses a custom responder is to be able to configure the statuses as described above, but you can also change that config on your own responder if you want. Check the `responders` readme for more info on that.
+    * If you have created a custom responder and/or failure app just to customize responses for better Hotwire/Turbo integration, they should no longer be necessary.
+    * `:turbo_stream` is now treated as a navigational format, so it works like HTML navigation when using Turbo. Note: if you relied on `:turbo_stream` to be treated as a non-navigational format before, you can reconfigure your `navigational_formats` in the Devise initializer file to exclude it.
+    * OmniAuth "Sign in with" links were changed to buttons that generate HTML forms with method=POST, instead of using link + method=POST that required rails-ujs to work. Since rails-ujs is no longer the default for new Rails apps, this allows the OmniAuth buttons to work in any scenario, with or without rails-ujs and/or Turbo. This only affects apps that are using the default `devise/shared/_links.html.erb` partial from Devise with OmniAuth enabled.
+    * The "Cancel my account" button was changed to include the `data-turbo-confirm` option, so that it works with both rails-ujs and Turbo by default.
+    * Devise does not provide "sign out" links/buttons in its shared views, but if you're using `sign_out_via` with `:delete` (the default), and are using links with `method: :delete`, those need to be updated with `data: { turbo_method: :delete }` instead for Turbo.
+    * Check [this upgrade guide](https://github.com/heartcombo/devise/wiki/How-To:-Upgrade-to-Devise-4.9.0-[Hotwire-Turbo-integration]) for more detailed information.
+
+### 4.8.1 - 2021-12-16
+
+* enhancements
+  * Add support for Rails 7.0. Please note that Turbo integration is not fully supported by Devise yet.
+
+### 4.8.0 - 2021-04-29
+
+* enhancements
+  * Devise now enables the upgrade of OmniAuth 2+. Previously Devise would raise an error if you'd try to upgrade. Please note that OmniAuth 2 is considered a security upgrade and recommended to everyone. You can read more about the details (and possible necessary changes to your app as part of the upgrade) in [their release notes](https://github.com/omniauth/omniauth/releases/tag/v2.0.0). [Devise's OmniAuth Overview wiki](https://github.com/heartcombo/devise/wiki/OmniAuth:-Overview) was also updated to cover OmniAuth 2.0 requirements.
+    - Note that the upgrade required Devise shared links that initiate the OmniAuth flow to be changed to `method: :post`, which is now a requirement for OmniAuth, part of the security improvement. If you have copied and customized the Devise shared links partial to your app, or if you have other links in your app that initiate the OmniAuth flow, they will have to be updated to use `method: :post`, or changed to use buttons (e.g. `button_to`) to work with OmniAuth 2. (if you're using links with `method: :post`, make sure your app has `rails-ujs` or `jquery-ujs` included in order for these links to work properly.)
+    - As part of the OmniAuth 2.0 upgrade you might also need to add the [`omniauth-rails_csrf_protection`](https://github.com/cookpad/omniauth-rails_csrf_protection) gem to your app if you don't have it already. (and you don't want to roll your own code to verify requests.) Check the OmniAuth v2 release notes for more info.
+  * Introduce `Lockable#reset_failed_attempts!` model method to reset failed attempts counter to 0 after the user signs in.
+    - This logic existed inside the lockable warden hook and is triggered automatically after the user signs in. The new model method is an extraction to allow you to override it in the application to implement things like switching to a write database if you're using the new multi-DB infrastructure from Rails for example, similar to how it's already possible with `Trackable#update_tracked_fields!`.
+  * Add support for Ruby 3.
+  * Add support for Rails 6.1.
+  * Move CI to GitHub Actions.
+
+* deprecations
+  * `Devise::Models::Authenticatable::BLACKLIST_FOR_SERIALIZATION` is deprecated in favor of `Devise::Models::Authenticatable::UNSAFE_ATTRIBUTES_FOR_SERIALIZATION` (@hanachin)
+
+### 4.7.3 - 2020-09-20
+
+* bug fixes
+  * Do not modify `:except` option given to `#serializable_hash`. (by @dpep)
+  * Fix thor deprecation when running the devise generator. (by @deivid-rodriguez)
+  * Fix hanging tests for streaming controllers using Devise. (by @afn)
+
+### 4.7.2 - 2020-06-10
+
+* enhancements
+  * Increase default stretches to 12 (by @sergey-alekseev)
+  * Ruby 2.7 support (kwarg warnings removed)
+
+* bug fixes
+  * Generate scoped views with proper scoped errors partial (by @shobhitic)
+  * Allow to set scoped `already_authenticated` error messages (by @gurgelrenan)
+
+### 4.7.1 - 2019-09-06
+
+* bug fixes
+  * Fix an edge case where records with a blank `confirmation_token` could be confirmed (by @tegon)
+  * Fix typo inside `update_needs_confirmation` i18n key (by @lslm)
+
+### 4.7.0 - 2019-08-19
+
+* enhancements
+  * Support Rails 6.0
+  * Update CI to rails 6.0.0.beta3 (by @tunnes)
+  * refactor method name to be more consistent (by @saiqulhaq)
+  * Fix rails 6.0.rc1 email uniqueness validation deprecation warning (by @Vasfed)
+
+* bug fixes
+  * Add `autocomplete="new-password"` to `password_confirmation` fields (by @ferrl)
+  * Fix rails_51_and_up? method for Rails 6.rc1 (by @igorkasyanchuk)
+
+### 4.6.2 - 2019-03-26
+
+* bug fixes
+  * Revert "Set `encrypted_password` to `nil` when `password` is set to `nil`" since it broke backward compatibility with existing applications. See more on https://github.com/heartcombo/devise/issues/5033#issuecomment-476386275 (by @mracos)
+
+### 4.6.1 - 2019-02-11
+
+* bug fixes
+  * Check if `root_path` is defined with `#respond_to?` instead of `#present` (by @tegon)
+
+### 4.6.0 - 2019-02-07
+
+* enhancements
+  * Allow to skip email and password change notifications (by @iorme1)
+  * Include the use of `nil` for `allow_unconfirmed_access_for` in the docs (by @joaumg)
+  * Ignore useless files into the `.gem` file (by @huacnlee)
+  * Explain the code that prevents enumeration attacks inside `Devise::Strategies::DatabaseAuthenticatable` (by @tegon)
+  * Refactor the `devise_error_messages!` helper to render a partial (by @prograhamer)
+  * Add an option (`Devise.sign_in_after_change_password`) to not automatically sign in a user after changing a password (by @knjko)
+
+* bug fixes
+  * Fix missing comma in Simple Form generator (by @colinross)
+  * Fix error with migration generator in Rails 6 (by @oystersauce8)
+  * Set `encrypted_password` to `nil` when `password` is set to `nil` (by @sivagollapalli)
+  * Consider whether the request supports flash messages inside `Devise::Controllers::Helpers#is_flashing_format?` (by @colinross)
+  * Fix typo inside `Devise::Generators::ControllersGenerator` (by @kopylovvlad)
+  * Sanitize parameters inside `Devise::Models::Authenticatable#find_or_initialize_with_errors` (by @rlue)
+  * `#after_database_authentication` callback was not called after authentication on password reset (by @kanmaniselvan)
+  * Fix corner case when `#confirmation_period_valid?` was called at the same second as `confirmation_sent_at` was set. Mostly true for date types that only have second precisions. (by @stanhu)
+  * Fix unclosed `li` tag in `error_messages` partial (by @mracos)
+  * Fix Routes issue when devise engine is mounted in another engine on Rails versions lower than 5.1 (by @a-barbieri)
+  * Make `#increment_failed_attempts` concurrency safe (by @tegon)
+  * Apply Test Helper fix to Rails 6.0 as well as 5.x (by @matthewrudy)


-Please check [4-stable](https://github.com/heartcombo/devise/blob/4-stable/CHANGELOG.md)
+* deprecations
+  * The second argument of `DatabaseAuthenticatable`'s `#update_with_password` and `#update_without_password` is deprecated and will be removed in the next major version. It was added to support a feature deprecated in Rails 4, so you can safely remove it from your code. (by @ihatov08)
+  * The `DeviseHelper.devise_error_messages!` is deprecated and will be removed in the next major version. Use the `devise/shared/error_messages` partial instead. (by @mracos)
+
+### 4.5.0 - 2018-08-15
+
+* enhancements
+  * Use `before_action` instead of `before_filter` (by @edenthecat)
+  *  Allow people to extend devise failure app, through invoking `ActiveSupport.run_load_hooks` once `Devise::FailureApp` is loaded (by @wnm)
+  * Use `update` instead of `update_attributes` (by @koic)
+  * Split IP resolution from `update_tracked_fields` (by @mckramer)
+  * upgrade dependencies for rails and responders (by @lancecarlson)
+  * Add `autocomplete="new-password"` to new password fields (by @gssbzn)
+  * Add `autocomplete="current-password"` to current password fields (by @gssbzn)
+  * Remove redundant `self` from `database_authenticatable` module (by @abhishekkanojia)
+  * Update `simple_form` templates with changes from https://github.com/heartcombo/devise/commit/16b3d6d67c7e017d461ea17ed29ea9738dc77e83 and https://github.com/heartcombo/devise/commit/6260c29a867b9a656f1e1557abe347a523178fab (by @gssbzn)
+  * Remove `:trackable` from the default modules in the generators, to be more GDPR-friendly (by @fakenine)
+
+* bug fixes
+  * Use same string on failed login regardless of whether account exists when in paranoid mode (by @TonyMK9068)
+  * Fix error when params is not a hash inside `Devise::ParameterSanitizer` (by @b0nn1e)
+  * Look for `secret_key_base` inside `Rails.application` (by @gencer)
+  * Ensure `Devise::ParameterFilter` does not add missing keys when called with a hash that has a `default` / `default_proc`
+configured (by @joshpencheon)
+  * Adds `is_navigational_format?` check to `after_sign_up_path_for` to keep consistency (by @iorme1)
+
+### 4.4.3 - 2018-03-17
+
+* bug fixes
+  * Fix undefined method `rails5?` for Devise::Test:Module (by @tegon)
+  * Fix: secret key was being required to be set inside credentials on Rails 5.2 (by @tegon)
+
+### 4.4.2 - 2018-03-15
+
+* enhancements
+  * Support for :credentials on Rails v5.2.x. (by @gencer)
+  * Improve documentation about the test suite. (by @tegon)
+  * Test with Rails 5.2.rc1 on Travis. (by @jcoyne)
+  * Allow test with Rails 6. (by @Fudoshiki)
+  * Creating a new section for controller configuration on `devise.rb` template (by @Danilo-Araujo-Silva)
+
+* bug fixes
+  * Preserve content_type for unauthenticated tests (by @gmcnaughton)
+  * Check if the resource is persisted in `update_tracked_fields!` instead of performing validations (by @tegon)
+  * Revert "Replace log_process_action to append_info_to_payload" (by @tegon)
+
+### 4.4.1 - 2018-01-23
+
+* bug fixes
+  * Ensure Gemspec is loaded as utf-8. (by @segiddins)
+  * Fix `ActiveRecord` check on `Confirmable`. (by @tegon)
+  * Fix `signed_in?` docs without running auth hooks. by (@machty)
+
+### 4.4.0 - 2017-12-29
+
+* enhancements
+  * Add `frozen_string_literal` pragma comment to all Ruby files. (by @pat)
+  * Use `set_flash_method!` instead of `set_flash_method` in `Devise::OmniauthCallbacksController#failure`. (by @saichander17)
+  * Clarify how `store_location_for` modifies URIs. (by @olivierlacan)
+  * Move `failed_attempts` increment into its own function. by (@mobilutz)
+  * Add `autocomplete="email"` to email fields. by (@MikeRogers0)
+  * Add the ability to change the default migrations path introduced in Rails 5.0.3.  (by @alexhifer)
+  * Delete unnecessary condition for helper method. (by @davydovanton)
+  * Support `id: :uuid` option for migrations. (by @filip373)
+
+* bug fixes
+  * Fix syntax for MRI 2.5.0. (by @pat)
+  * Validations were being ignored on singup in the `Trackable#update_tracked_fields!` method. (by @AshleyFoster)
+  * Do not modify options for `#serializable_hash`. (by @guigs)
+  * Email confirmations were being sent on sign in/sign out for application using `mongoid` and `mongoid-paperclip` gems. This is because previously we were checking if a model is from Active Record by checking if the method `after_commit` was defined - since `mongoid` doesn' have one - but `mongoid-paperclip` gem does define one, which cause this issue. (by @fjg)
+
+### 4.3.0 - 2017-05-14
+
+* Enhancements
+  * Dependency support added for Rails 5.1.x.
+
+### 4.2.1 - 2017-03-15
+
+* removals
+  * `Devise::Mailer#scope_name` and `Devise::Mailer#resource` are now protected
+    methods instead of public.
+* bug fixes
+  * Attempt to reset password without the password field in the request now results in a `:blank` validation error.
+    Before this change, Devise would accept the reset password request and log the user in, without validating/changing
+    the password. (by @victor-am)
+  * Confirmation links now expire based on UTC time, working properly when using different timezones. (by @jjuliano)
+* enhancements
+  * Notify the original email when it is changed with a new `Devise.send_email_changed_notification` setting.
+    When using `reconfirmable`, the notification will be sent right away instead of when the unconfirmed email is confirmed.
+    (original change by @ethirajsrinivasan)
+
+### 4.2.0 - 2016-07-01
+
+* removals
+  * Remove the deprecated `Devise::ParameterSanitizer` API from Devise 3.
+    Please use the `#permit` and `#sanitize` methods over `#for`.
+  * Remove the deprecated OmniAuth URL helpers. Use the fully qualified helpers
+    (`user_facebook_omniauth_authorize_path`) over the scope based helpers
+    ( `user_omniauth_authorize_path(:facebook)`).
+  * Remove the `Devise.bcrypt` method, use `Devise::Encryptor.digest` instead.
+  * Remove the `Devise::Models::Confirmable#confirm!` method, use `confirm` instead.
+  * Remove the `Devise::Models::Recoverable#reset_password!` method, use `reset_password` instead.
+  * Remove the `Devise::Models::Recoverable#after_password_reset` method.
+* bug fixes
+  * Fix an `ActionDispatch::IllegalStateError` when testing controllers with Rails 5 rc 2(by @hamadata).
+  * Use `ActiveSupport.on_load` hooks to include Devise on `ActiveRecord` and `Mongoid`,
+    avoiding autoloading these constants too soon (by @lucasmazza, @rafaelfranca).
+* enhancements
+  * Display the minimum password length on `registrations/edit` view (by @Yanchek99).
+  * You can disable Devise's routes reloading on boot by through the `reload_routes = false` config.
+    This can reduce the time taken to boot the application but it might trigger
+    some errors if you application (mostly your controllers) requires that
+    Devise mappings be loaded during boot time (by @sidonath).
+  * Added `Devise::Test::IntegrationHelpers` to bypass the sign in process using
+    Warden test API (by @lucasmazza).
+  * Define `inspect` in `Devise::Models::Authenticatable` to help ensure password hashes
+    aren't included in exceptions or otherwise accidentally serialized (by @tkrajcar).
+  * Add missing support of `Rails.application.config.action_controller.relative_url_root` (by @kosdiamantis).
+* deprecations
+  * `Devise::TestHelpers` is deprecated in favor of `Devise::Test::ControllerHelpers`
+    (by @lucasmazza).
+  * The `sign_in` test helper has changed to use keyword arguments when passing
+    a scope. `sign_in :admin, users(:alice)` should be rewritten as
+    `sign_in users(:alice), scope: :admin` (by @lucasmazza).
+  * The option `bypass` of `Devise::Controllers::SignInOut#sign_in` method is
+    deprecated in favor of `Devise::Controllers::SignInOut#bypass_sign_in`
+    method (by @ulissesalmeida).
+
+### 4.1.1 - 2016-05-15
+
+* bug fixes
+  * Fix overwriting the remember_token when a valid one already exists (by @ralinchimev).
+
+### 4.1.0
+
+* bug fixes
+  * Fix race condition of sending the confirmation instructions e-mail using background jobs.
+    Using the previous `after_create` callback, the e-mail can be sent before
+    the record be committed on database, generating a `ActiveRecord::NotFound` error.
+    Now the confirmation e-mail will be only sent after the database commit,
+    using the `after_commit` callback.
+    It may break your test suite on Rails 4 if you are testing the sent e-mails
+    or enqueued jobs using transactional fixtures enabled or `DatabaseCleaner` with `transaction` strategy.
+    You can easily fix your test suite using the gem
+    [test_after_commit](https://github.com/grosser/test_after_commit). For example, put in your Gemfile:
+
+    ```ruby
+      gem 'test_after_commit', :group => :test
+    ```
+
+    On Rails 5 `after_commit` callbacks are triggered even using transactional
+    fixtures, then this fix will not break your test suite. If you are using `DatabaseCleaner` with the `deletion` or `truncation` strategies it may not break your tests. (by @allenwq)
+  * Fix strategy checking in `Lockable#unlock_strategy_enabled?` for `:none` and
+  `:undefined` strategies. (by @f3ndot)
+* features
+  * Humanize authentication keys in failure flash message (by @byzg)
+    When you are configuring the translations of `devise.failure.invalid`, the
+    `authentication_keys` is translated now.
+* deprecations
+  * Remove code supporting old session serialization format (by @fphilipe).
+  * Now the `email_regexp` default uses a more permissive regex:
+    `/\A[^@\s]+@[^@\s]+\z/` (by @kimgb)
+  * Now the `strip_whitespace_keys` default is `[:email]` (by @ulissesalmeida)
+  * Now the `reconfirmable` default is `true` (by @ulissesalmeida)
+  * Now the `skip_session_storage` default is `[:http_auth]` (by @ulissesalmeida)
+  * Now the `sign_out_via` default is `:delete` (by @ulissesalmeida)
+* improvements
+  * Avoids extra computation of friendly token for confirmation token (by @sbc100)
+
+### 4.0.3 - 2016-05-15
+
+  * bug fixes
+    * Fix overwriting the remember_token when a valid one already exists (by @ralinchimev).
+
+### 4.0.2 - 2016-05-02
+
+* bug fixes
+  * Fix strategy checking in `Lockable#unlock_strategy_enabled?` for `:none`
+    and `:undefined` strategies. (by @f3ndot)
+
+### 4.0.1 - 2016-04-25
+
+* bug fixes
+  * Fix the e-mail confirmation instructions send when a user updates the email
+    address from nil. (by @lmduc)
+  * Remove unnecessary `attribute_will_change!` call. (by @cadejscroggins)
+  * Consistent `permit!` check. (by @ulissesalmeida)
+
+### 4.0.0 - 2016-04-18
+
+* bug fixes
+  * Fix the `extend_remember_period` configuration. When set to `false` it does
+    not update the cookie expiration anymore.(by @ulissesalmeida)
+
+* deprecations
+  * Added a warning of default value change in Devise 4.1 for users that uses
+    the the default configuration of the following configurations: (by @ulissesalmeida)
+    * `strip_whitespace_keys` - The default will be `[:email]`.
+    * `skip_session_storage` - The default will be `[:http_auth]`.
+    * `sign_out_via` - The default will be `:delete`.
+    * `reconfirmable` - The default will be `true`.
+    * `email_regexp` - The default will be `/\A[^@\s]+@[^@\s]+\z/`.
+  * Removed deprecated argument of `Devise::Models::Rememberable#remember_me!` (by @ulissesalmeida)
+  * Removed deprecated private method Devise::Controllers::Helpers#expire_session_data_after_sign_in!
+    (by @bogdanvlviv)
+
+### 4.0.0.rc2 - 2016-03-09
+
+* enhancements
+  * Introduced `DeviseController#set_flash_message!` for conditional flash
+    messages setting to reduce complexity.
+  * `rails g devise:install` will fail if the app does not have a ORM configured
+    (by @arjunsharma)
+  * Support to Rails 5 versioned migrations added.
+
+* deprecations
+  * omniauth routes are no longer defined with a wildcard `:provider` parameter,
+    and provider specific routes are defined instead, so route helpers like `user_omniauth_authorize_path(:github)` are deprecated in favor of `user_github_omniauth_authorize_path`.
+    You can still use `omniauth_authorize_path(:user, :github)` if you need to
+    call the helpers dynamically.
+
+### 4.0.0.rc1 - 2016-02-01
+
+* Support added to Rails 5 (by @twalpole).
+* Devise no longer supports Rails 3.2 and 4.0.
+* Devise no longer supports Ruby 1.9 and 2.0.
+
+* deprecations
+  * The `devise_parameter_sanitize` API has changed:
+    The `for` method was deprecated in favor of `permit`:
+
+    ```ruby
+    def configure_permitted_parameters
+      devise_parameter_sanitizer.for(:sign_up) << :subscribe_newsletter
+      # Should become the following.
+      devise_parameter_sanitizer.permit(:sign_up, keys: [:subscribe_newsletter])
+    end
+    ```
+
+    The customization through instance methods on the sanitizer implementation
+    should be done through it's `initialize` method:
+
+    ```ruby
+    class User::ParameterSanitizer < Devise::ParameterSanitizer
+      def sign_up
+        default_params.permit(:username, :email)
+      end
+    end
+
+    # The `sign_up` method can be a `permit` call on the sanitizer `initialize`.
+
+    class User::ParameterSanitizer < Devise::ParameterSanitizer
+      def initialize(*)
+        super
+        permit(:sign_up, keys: [:username, :email])
+      end
+    end
+    ```
+
+    You can check more examples and explanations on the [README section](README.md#strong-parameters)
+    and on the [ParameterSanitizer docs](lib/devise/parameter_sanitizer.rb).
+
+Please check [3-stable](https://github.com/heartcombo/devise/blob/3-stable/CHANGELOG.md)
 for previous changes.
--- a/CODE_OF_CONDUCT.md
+++ b/CODE_OF_CONDUCT.md
@@ -17,6 +17,6 @@ Project maintainers have the right and responsibility to remove, edit, or reject

 This code of conduct applies both within project spaces and in public spaces when an individual is representing the project or its community.

-Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by sending an email to [heartcombo.oss@gmail.com](heartcombo.oss@gmail.com) or contacting one or more of the project maintainers.
+Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by sending an email to [heartcombo@googlegroups.com](heartcombo@googlegroups.com) or contacting one or more of the project maintainers.

 This Code of Conduct is adapted from the [Contributor Covenant](http://contributor-covenant.org), version 1.2.0, available at [http://contributor-covenant.org/version/1/2/0/](http://contributor-covenant.org/version/1/2/0/)
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -30,7 +30,7 @@ the project wiki, documentation and source code first, or try to ask your questi
 on [Stack Overflow](http://stackoverflow.com/questions/tagged/devise).

 **If you find a security bug, do not report it through GitHub. Please send an
-e-mail to [heartcombo.oss@gmail.com](mailto:heartcombo.oss@gmail.com)
+e-mail to [heartcombo@googlegroups.com](mailto:heartcombo@googlegroups.com)
 instead.**

 ## Sending Pull Requests
--- a/25
+++ b/25
@@ -4,30 +4,35 @@ source "https://rubygems.org"

 gemspec

+gem "rails", "~> 7.1.0"
 gem "omniauth"
 gem "omniauth-oauth2"
-gem "rails", "~> 8.1.0"
 gem "rdoc"

-gem "rails-controller-testing"
+gem "rails-controller-testing", github: "rails/rails-controller-testing"

 gem "responders", "~> 3.1"

 group :test do
-  gem "minitest", "< 6"
-  gem "mocha", "~> 2.1", require: false
  gem "omniauth-facebook"
  gem "omniauth-openid"
  gem "rexml"
  gem "timecop"
-  gem "webrat"
-  gem "ostruct"
+  gem "webrat", "0.7.3", require: false
+  gem "mocha", "~> 2.1", require: false
 end

 platforms :ruby do
-  gem "sqlite3"
+  gem "sqlite3", "~> 1.4"
 end

-group :mongoid do
-  gem "mongoid", "~> 9.0", github: "mongodb/mongoid", branch: "9.0-stable"
-end
+# platforms :jruby do
+#   gem "activerecord-jdbc-adapter"
+#   gem "activerecord-jdbcsqlite3-adapter"
+#   gem "jruby-openssl"
+# end
+
+# TODO:
+# group :mongoid do
+#   gem "mongoid", "~> 4.0.0"
+# end
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,312 +1,271 @@
 GIT
-  remote: https://github.com/mongodb/mongoid.git
-  revision: 4dcdaddea5d88a819c7c0d98ea0e994e13f515fe
-  branch: 9.0-stable
+  remote: https://github.com/rails/rails-controller-testing.git
+  revision: c203673f8011a7cdc2a8edf995ae6b3eec3417ca
  specs:
-    mongoid (9.0.9)
-      activemodel (>= 5.1, < 8.2, != 7.0.0)
-      concurrent-ruby (>= 1.0.5, < 2.0)
-      mongo (>= 2.18.0, < 3.0.0)
+    rails-controller-testing (1.0.5)
+      actionpack (>= 5.0.1.rc1)
+      actionview (>= 5.0.1.rc1)
+      activesupport (>= 5.0.1.rc1)

 PATH
  remote: .
  specs:
-    devise (5.0.0.rc)
+    devise (4.9.4)
      bcrypt (~> 3.0)
      orm_adapter (~> 0.1)
-      railties (>= 7.0)
+      railties (>= 4.1.0)
      responders
      warden (~> 1.2.3)

 GEM
  remote: https://rubygems.org/
  specs:
-    action_text-trix (2.1.15)
-      railties
-    actioncable (8.1.1)
-      actionpack (= 8.1.1)
-      activesupport (= 8.1.1)
+    actioncable (7.1.0)
+      actionpack (= 7.1.0)
+      activesupport (= 7.1.0)
      nio4r (~> 2.0)
      websocket-driver (>= 0.6.1)
      zeitwerk (~> 2.6)
-    actionmailbox (8.1.1)
-      actionpack (= 8.1.1)
-      activejob (= 8.1.1)
-      activerecord (= 8.1.1)
-      activestorage (= 8.1.1)
-      activesupport (= 8.1.1)
-      mail (>= 2.8.0)
-    actionmailer (8.1.1)
-      actionpack (= 8.1.1)
-      actionview (= 8.1.1)
-      activejob (= 8.1.1)
-      activesupport (= 8.1.1)
-      mail (>= 2.8.0)
+    actionmailbox (7.1.0)
+      actionpack (= 7.1.0)
+      activejob (= 7.1.0)
+      activerecord (= 7.1.0)
+      activestorage (= 7.1.0)
+      activesupport (= 7.1.0)
+      mail (>= 2.7.1)
+      net-imap
+      net-pop
+      net-smtp
+    actionmailer (7.1.0)
+      actionpack (= 7.1.0)
+      actionview (= 7.1.0)
+      activejob (= 7.1.0)
+      activesupport (= 7.1.0)
+      mail (~> 2.5, >= 2.5.4)
+      net-imap
+      net-pop
+      net-smtp
      rails-dom-testing (~> 2.2)
-    actionpack (8.1.1)
-      actionview (= 8.1.1)
-      activesupport (= 8.1.1)
+    actionpack (7.1.0)
+      actionview (= 7.1.0)
+      activesupport (= 7.1.0)
      nokogiri (>= 1.8.5)
      rack (>= 2.2.4)
      rack-session (>= 1.0.1)
      rack-test (>= 0.6.3)
      rails-dom-testing (~> 2.2)
      rails-html-sanitizer (~> 1.6)
-      useragent (~> 0.16)
-    actiontext (8.1.1)
-      action_text-trix (~> 2.1.15)
-      actionpack (= 8.1.1)
-      activerecord (= 8.1.1)
-      activestorage (= 8.1.1)
-      activesupport (= 8.1.1)
+    actiontext (7.1.0)
+      actionpack (= 7.1.0)
+      activerecord (= 7.1.0)
+      activestorage (= 7.1.0)
+      activesupport (= 7.1.0)
      globalid (>= 0.6.0)
      nokogiri (>= 1.8.5)
-    actionview (8.1.1)
-      activesupport (= 8.1.1)
+    actionview (7.1.0)
+      activesupport (= 7.1.0)
      builder (~> 3.1)
      erubi (~> 1.11)
      rails-dom-testing (~> 2.2)
      rails-html-sanitizer (~> 1.6)
-    activejob (8.1.1)
-      activesupport (= 8.1.1)
+    activejob (7.1.0)
+      activesupport (= 7.1.0)
      globalid (>= 0.3.6)
-    activemodel (8.1.1)
-      activesupport (= 8.1.1)
-    activerecord (8.1.1)
-      activemodel (= 8.1.1)
-      activesupport (= 8.1.1)
+    activemodel (7.1.0)
+      activesupport (= 7.1.0)
+    activerecord (7.1.0)
+      activemodel (= 7.1.0)
+      activesupport (= 7.1.0)
      timeout (>= 0.4.0)
-    activestorage (8.1.1)
-      actionpack (= 8.1.1)
-      activejob (= 8.1.1)
-      activerecord (= 8.1.1)
-      activesupport (= 8.1.1)
+    activestorage (7.1.0)
+      actionpack (= 7.1.0)
+      activejob (= 7.1.0)
+      activerecord (= 7.1.0)
+      activesupport (= 7.1.0)
      marcel (~> 1.0)
-    activesupport (8.1.1)
+    activesupport (7.1.0)
      base64
      bigdecimal
-      concurrent-ruby (~> 1.0, >= 1.3.1)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
      connection_pool (>= 2.2.5)
      drb
      i18n (>= 1.6, < 2)
-      json
-      logger (>= 1.4.2)
      minitest (>= 5.1)
-      securerandom (>= 0.3)
-      tzinfo (~> 2.0, >= 2.0.5)
-      uri (>= 0.13.1)
-    base64 (0.3.0)
-    bcrypt (3.1.20)
-    bigdecimal (4.0.1)
-    bson (5.2.0)
-    builder (3.3.0)
-    concurrent-ruby (1.3.6)
-    connection_pool (3.0.2)
+      mutex_m
+      tzinfo (~> 2.0)
+    base64 (0.1.1)
+    bcrypt (3.1.19)
+    bigdecimal (3.1.4)
+    builder (3.2.4)
+    concurrent-ruby (1.2.2)
+    connection_pool (2.4.1)
    crass (1.0.6)
-    date (3.5.1)
-    drb (2.2.3)
-    erb (6.0.1)
-    erubi (1.13.1)
-    faraday (2.14.0)
-      faraday-net_http (>= 2.0, < 3.5)
-      json
-      logger
-    faraday-net_http (3.4.2)
-      net-http (~> 0.5)
-    globalid (1.3.0)
-      activesupport (>= 6.1)
-    hashie (5.1.0)
-      logger
-    i18n (1.14.8)
-      concurrent-ruby (~> 1.0)
-    io-console (0.8.2)
-    irb (1.16.0)
-      pp (>= 0.6.0)
-      rdoc (>= 4.0.0)
-      reline (>= 0.4.2)
-    json (2.18.0)
-    jwt (3.1.2)
+    date (3.3.3)
+    drb (2.1.1)
+      ruby2_keywords
+    erubi (1.12.0)
+    faraday (2.7.11)
      base64
-    logger (1.7.0)
-    loofah (2.25.0)
+      faraday-net_http (>= 2.0, < 3.1)
+      ruby2_keywords (>= 0.0.4)
+    faraday-net_http (3.0.2)
+    globalid (1.2.1)
+      activesupport (>= 6.1)
+    hashie (5.0.0)
+    i18n (1.14.1)
+      concurrent-ruby (~> 1.0)
+    io-console (0.6.0)
+    irb (1.8.1)
+      rdoc
+      reline (>= 0.3.8)
+    jwt (2.7.1)
+    loofah (2.21.3)
      crass (~> 1.0.2)
      nokogiri (>= 1.12.0)
-    mail (2.9.0)
-      logger
+    mail (2.8.1)
      mini_mime (>= 0.1.1)
      net-imap
      net-pop
      net-smtp
-    marcel (1.1.0)
+    marcel (1.0.2)
    mini_mime (1.1.5)
-    mini_portile2 (2.8.9)
-    minitest (5.27.0)
-    mocha (2.8.2)
+    mini_portile2 (2.8.4)
+    minitest (5.20.0)
+    mocha (2.1.0)
      ruby2_keywords (>= 0.0.5)
-    mongo (2.22.0)
-      base64
-      bson (>= 4.14.1, < 6.0.0)
-    multi_xml (0.8.0)
-      bigdecimal (>= 3.1, < 5)
-    net-http (0.9.1)
-      uri (>= 0.11.1)
-    net-imap (0.6.2)
+    multi_xml (0.6.0)
+    mutex_m (0.1.2)
+    net-imap (0.4.1)
      date
      net-protocol
    net-pop (0.1.2)
      net-protocol
-    net-protocol (0.2.2)
+    net-protocol (0.2.1)
      timeout
-    net-smtp (0.5.1)
+    net-smtp (0.4.0)
      net-protocol
-    nio4r (2.7.5)
-    nokogiri (1.19.0)
+    nio4r (2.5.9)
+    nokogiri (1.15.4)
      mini_portile2 (~> 2.8.2)
      racc (~> 1.4)
-    oauth2 (2.0.18)
-      faraday (>= 0.17.3, < 4.0)
-      jwt (>= 1.0, < 4.0)
-      logger (~> 1.2)
+    oauth2 (2.0.9)
+      faraday (>= 0.17.3, < 3.0)
+      jwt (>= 1.0, < 3.0)
      multi_xml (~> 0.5)
      rack (>= 1.2, < 4)
-      snaky_hash (~> 2.0, >= 2.0.3)
-      version_gem (~> 1.1, >= 1.1.9)
-    omniauth (2.1.4)
+      snaky_hash (~> 2.0)
+      version_gem (~> 1.1)
+    omniauth (2.1.1)
      hashie (>= 3.4.6)
-      logger
      rack (>= 2.2.3)
      rack-protection
-    omniauth-facebook (10.0.0)
-      bigdecimal
-      omniauth-oauth2 (>= 1.2, < 3)
-    omniauth-oauth2 (1.9.0)
-      oauth2 (>= 2.0.2, < 3)
+    omniauth-facebook (9.0.0)
+      omniauth-oauth2 (~> 1.2)
+    omniauth-oauth2 (1.8.0)
+      oauth2 (>= 1.4, < 3)
      omniauth (~> 2.0)
-    omniauth-openid (2.0.2)
-      omniauth (>= 1.1)
-      rack-openid (~> 1.4)
-      ruby-openid (~> 2.1, >= 2.1.8)
-      version_gem (~> 1.1, >= 1.1.8)
+    omniauth-openid (2.0.1)
+      omniauth (>= 1.0, < 3.0)
+      rack-openid (~> 1.4.0)
    orm_adapter (0.5.0)
-    ostruct (0.6.3)
-    pp (0.6.3)
-      prettyprint
-    prettyprint (0.2.0)
-    psych (5.3.1)
-      date
+    psych (5.1.0)
      stringio
-    racc (1.8.1)
-    rack (3.2.4)
+    racc (1.7.1)
+    rack (2.2.8)
    rack-openid (1.4.2)
      rack (>= 1.1.0)
      ruby-openid (>= 2.1.8)
-    rack-protection (4.2.1)
-      base64 (>= 0.1.0)
-      logger (>= 1.6.0)
-      rack (>= 3.0.0, < 4)
-    rack-session (2.1.1)
-      base64 (>= 0.1.0)
-      rack (>= 3.0.0)
-    rack-test (2.2.0)
+    rack-protection (3.1.0)
+      rack (~> 2.2, >= 2.2.4)
+    rack-session (1.0.1)
+      rack (< 3)
+    rack-test (2.1.0)
      rack (>= 1.3)
-    rackup (2.3.1)
-      rack (>= 3)
-    rails (8.1.1)
-      actioncable (= 8.1.1)
-      actionmailbox (= 8.1.1)
-      actionmailer (= 8.1.1)
-      actionpack (= 8.1.1)
-      actiontext (= 8.1.1)
-      actionview (= 8.1.1)
-      activejob (= 8.1.1)
-      activemodel (= 8.1.1)
-      activerecord (= 8.1.1)
-      activestorage (= 8.1.1)
-      activesupport (= 8.1.1)
+    rackup (1.0.0)
+      rack (< 3)
+      webrick
+    rails (7.1.0)
+      actioncable (= 7.1.0)
+      actionmailbox (= 7.1.0)
+      actionmailer (= 7.1.0)
+      actionpack (= 7.1.0)
+      actiontext (= 7.1.0)
+      actionview (= 7.1.0)
+      activejob (= 7.1.0)
+      activemodel (= 7.1.0)
+      activerecord (= 7.1.0)
+      activestorage (= 7.1.0)
+      activesupport (= 7.1.0)
      bundler (>= 1.15.0)
-      railties (= 8.1.1)
-    rails-controller-testing (1.0.5)
-      actionpack (>= 5.0.1.rc1)
-      actionview (>= 5.0.1.rc1)
-      activesupport (>= 5.0.1.rc1)
-    rails-dom-testing (2.3.0)
+      railties (= 7.1.0)
+    rails-dom-testing (2.2.0)
      activesupport (>= 5.0.0)
      minitest
      nokogiri (>= 1.6)
-    rails-html-sanitizer (1.6.2)
+    rails-html-sanitizer (1.6.0)
      loofah (~> 2.21)
-      nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
-    railties (8.1.1)
-      actionpack (= 8.1.1)
-      activesupport (= 8.1.1)
-      irb (~> 1.13)
+      nokogiri (~> 1.14)
+    railties (7.1.0)
+      actionpack (= 7.1.0)
+      activesupport (= 7.1.0)
+      irb
      rackup (>= 1.0.0)
      rake (>= 12.2)
      thor (~> 1.0, >= 1.2.2)
-      tsort (>= 0.2)
      zeitwerk (~> 2.6)
-    rake (13.3.1)
-    rdoc (7.0.3)
-      erb
+    rake (13.0.6)
+    rdoc (6.5.0)
      psych (>= 4.0.0)
-      tsort
-    reline (0.6.3)
+    reline (0.3.9)
      io-console (~> 0.5)
-    responders (3.2.0)
-      actionpack (>= 7.0)
-      railties (>= 7.0)
-    rexml (3.4.4)
+    responders (3.1.0)
+      actionpack (>= 5.2)
+      railties (>= 5.2)
+    rexml (3.2.6)
    ruby-openid (2.9.2)
    ruby2_keywords (0.0.5)
-    securerandom (0.4.1)
-    snaky_hash (2.0.3)
-      hashie (>= 0.1.0, < 6)
-      version_gem (>= 1.1.8, < 3)
-    sqlite3 (2.9.0)
+    snaky_hash (2.0.1)
+      hashie
+      version_gem (~> 1.1, >= 1.1.1)
+    sqlite3 (1.6.6)
      mini_portile2 (~> 2.8.0)
-    stringio (3.2.0)
-    thor (1.4.0)
-    timecop (0.9.10)
-    timeout (0.6.0)
-    tsort (0.2.0)
+    stringio (3.0.8)
+    thor (1.2.2)
+    timecop (0.9.8)
+    timeout (0.4.0)
    tzinfo (2.0.6)
      concurrent-ruby (~> 1.0)
-    uri (1.1.1)
-    useragent (0.16.11)
-    version_gem (1.1.9)
+    version_gem (1.1.3)
    warden (1.2.9)
      rack (>= 2.0.9)
    webrat (0.7.3)
      nokogiri (>= 1.2.0)
      rack (>= 1.0)
      rack-test (>= 0.5.3)
-    websocket-driver (0.8.0)
-      base64
+    webrick (1.8.1)
+    websocket-driver (0.7.6)
      websocket-extensions (>= 0.1.0)
    websocket-extensions (0.1.5)
-    zeitwerk (2.7.4)
+    zeitwerk (2.6.12)

 PLATFORMS
  ruby

 DEPENDENCIES
  devise!
-  minitest (< 6)
  mocha (~> 2.1)
-  mongoid (~> 9.0)!
  omniauth
  omniauth-facebook
  omniauth-oauth2
  omniauth-openid
-  ostruct
-  rails (~> 8.1.0)
-  rails-controller-testing
+  rails (~> 7.1.0)
+  rails-controller-testing!
  rdoc
  responders (~> 3.1)
  rexml
-  sqlite3
+  sqlite3 (~> 1.4)
  timecop
-  webrat
+  webrat (= 0.7.3)

 BUNDLED WITH
-  4.0.3
+   2.4.5
--- a/ISSUE_TEMPLATE.md
+++ b/ISSUE_TEMPLATE.md
@@ -2,7 +2,7 @@

 - Do not use the issues tracker for help or support, try Stack Overflow.
 - For bugs, do a quick search and make sure the bug has not yet been reported
- If you found a security bug, do not report it through GitHub. Please send an e-mail to heartcombo.oss@gmail.com instead.
+- If you found a security bug, do not report it through GitHub. Please send an e-mail to heartcombo@googlegroups.com instead.
 - Finally, be nice and have fun!

 ## Environment
--- a/4
+++ b/4
@@ -1,5 +1,5 @@
-Copyright (c) 2020-CURRENT Rafael França, Carlos Antonio da Silva
-Copyright (c) 2009-2019 Plataformatec
+Copyright 2020-2024 Rafael França, Leonardo Tegon, Carlos Antônio da Silva.
+Copyright 2009-2019 Plataformatec.

 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
--- a/README.md
+++ b/README.md
@@ -9,16 +9,16 @@ Devise is a flexible authentication solution for Rails based on Warden. It:

 It's composed of 10 modules:

-* [Database Authenticatable](https://www.rubydoc.info/gems/devise/Devise/Models/DatabaseAuthenticatable): hashes and stores a password in the database to validate the authenticity of a user while signing in. The authentication can be done both through POST requests or HTTP Basic Authentication.
-* [Omniauthable](https://www.rubydoc.info/gems/devise/Devise/Models/Omniauthable): adds OmniAuth (https://github.com/omniauth/omniauth) support.
-* [Confirmable](https://www.rubydoc.info/gems/devise/Devise/Models/Confirmable): sends emails with confirmation instructions and verifies whether an account is already confirmed during sign in.
-* [Recoverable](https://www.rubydoc.info/gems/devise/Devise/Models/Recoverable): resets the user password and sends reset instructions.
-* [Registerable](https://www.rubydoc.info/gems/devise/Devise/Models/Registerable): handles signing up users through a registration process, also allowing them to edit and destroy their account.
-* [Rememberable](https://www.rubydoc.info/gems/devise/Devise/Models/Rememberable): manages generating and clearing a token for remembering the user from a saved cookie.
-* [Trackable](https://www.rubydoc.info/gems/devise/Devise/Models/Trackable): tracks sign in count, timestamps and IP address.
-* [Timeoutable](https://www.rubydoc.info/gems/devise/Devise/Models/Timeoutable): expires sessions that have not been active in a specified period of time.
-* [Validatable](https://www.rubydoc.info/gems/devise/Devise/Models/Validatable): provides validations of email and password. It's optional and can be customized, so you're able to define your own validations.
-* [Lockable](https://www.rubydoc.info/gems/devise/Devise/Models/Lockable): locks an account after a specified number of failed sign-in attempts. Can unlock via email or after a specified time period.
+* [Database Authenticatable](http://www.rubydoc.info/github/heartcombo/devise/main/Devise/Models/DatabaseAuthenticatable): hashes and stores a password in the database to validate the authenticity of a user while signing in. The authentication can be done both through POST requests or HTTP Basic Authentication.
+* [Omniauthable](http://www.rubydoc.info/github/heartcombo/devise/main/Devise/Models/Omniauthable): adds OmniAuth (https://github.com/omniauth/omniauth) support.
+* [Confirmable](http://www.rubydoc.info/github/heartcombo/devise/main/Devise/Models/Confirmable): sends emails with confirmation instructions and verifies whether an account is already confirmed during sign in.
+* [Recoverable](http://www.rubydoc.info/github/heartcombo/devise/main/Devise/Models/Recoverable): resets the user password and sends reset instructions.
+* [Registerable](http://www.rubydoc.info/github/heartcombo/devise/main/Devise/Models/Registerable): handles signing up users through a registration process, also allowing them to edit and destroy their account.
+* [Rememberable](http://www.rubydoc.info/github/heartcombo/devise/main/Devise/Models/Rememberable): manages generating and clearing a token for remembering the user from a saved cookie.
+* [Trackable](http://www.rubydoc.info/github/heartcombo/devise/main/Devise/Models/Trackable): tracks sign in count, timestamps and IP address.
+* [Timeoutable](http://www.rubydoc.info/github/heartcombo/devise/main/Devise/Models/Timeoutable): expires sessions that have not been active in a specified period of time.
+* [Validatable](http://www.rubydoc.info/github/heartcombo/devise/main/Devise/Models/Validatable): provides validations of email and password. It's optional and can be customized, so you're able to define your own validations.
+* [Lockable](http://www.rubydoc.info/github/heartcombo/devise/main/Devise/Models/Lockable): locks an account after a specified number of failed sign-in attempts. Can unlock via email or after a specified time period.

 ## Table of Contents

@@ -31,7 +31,6 @@ It's composed of 10 modules:
 	- [RDocs](#rdocs)
 	- [Example applications](#example-applications)
 	- [Extensions](#extensions)
-	- [Supported Ruby / Rails versions](#supported-ruby--rails-versions)
 	- [Contributing](#contributing)
 - [Starting with Rails?](#starting-with-rails)
 - [Getting started](#getting-started)
@@ -53,6 +52,7 @@ It's composed of 10 modules:
 	- [Rails API mode](#rails-api-mode)
 - [Additional information](#additional-information)
 	- [Warden](#warden)
+	- [Contributors](#contributors)
 - [License](#license)

 <!-- /TOC -->
@@ -73,7 +73,7 @@ If you discover a problem with Devise, we would like to know about it. However,

 https://github.com/heartcombo/devise/wiki/Bug-reports

-If you have discovered a security related bug, please do *NOT* use the GitHub issue tracker. Send an email to heartcombo.oss@gmail.com.
+If you have discovered a security related bug, please do *NOT* use the GitHub issue tracker. Send an email to heartcombo@googlegroups.com.

 ### StackOverflow and Mailing List

@@ -81,10 +81,9 @@ If you have any questions, comments, or concerns, please use StackOverflow inste

 http://stackoverflow.com/questions/tagged/devise

-The deprecated mailing lists can still be read on:
+The deprecated mailing list can still be read on

 https://groups.google.com/group/plataformatec-devise
-https://groups.google.com/group/heartcombo

 ### RDocs

@@ -106,13 +105,6 @@ Our community has created a number of extensions that add functionality above an

 https://github.com/heartcombo/devise/wiki/Extensions

-### Supported Ruby / Rails versions
-
-We intend to maintain support for all Ruby / Rails versions that haven't reached end-of-life.
-
-For more information about specific versions please check [Ruby](https://www.ruby-lang.org/en/downloads/branches/)
-and [Rails](https://guides.rubyonrails.org/maintenance_policy.html) maintenance policies, and our test matrix.
-
 ### Contributing

 We hope that you will consider contributing to Devise. Please read this short overview for some information about how to get started:
@@ -122,7 +114,7 @@ https://github.com/heartcombo/devise/wiki/Contributing
 You will usually want to write tests for your changes.  To run the test suite, go into Devise's top-level directory and run `bundle install` and `bin/test`.
 Devise works with multiple Ruby and Rails versions, and ActiveRecord and Mongoid ORMs, which means you can run the test suite with some modifiers: `DEVISE_ORM` and `BUNDLE_GEMFILE`.

-#### DEVISE_ORM
+### DEVISE_ORM
 Since Devise supports both Mongoid and ActiveRecord, we rely on this variable to run specific code for each ORM.
 The default value of `DEVISE_ORM` is `active_record`. To run the tests for Mongoid, you can pass `mongoid`:
 ```
@@ -134,20 +126,20 @@ When running the tests for Mongoid, you will need to have a MongoDB server (vers

 Please note that the command output will show the variable value being used.

-#### BUNDLE_GEMFILE
+### BUNDLE_GEMFILE
 We can use this variable to tell bundler what Gemfile it should use (instead of the one in the current directory).
 Inside the [gemfiles](https://github.com/heartcombo/devise/tree/main/gemfiles) directory, we have one for each version of Rails we support. When you send us a pull request, it may happen that the test suite breaks using some of them. If that's the case, you can simulate the same environment using the `BUNDLE_GEMFILE` variable.
-For example, if the tests broke using Ruby 3.4 and Rails 8.0, you can do the following:
+For example, if the tests broke using Ruby 2.4.2 and Rails 4.1, you can do the following:
 ```bash
-chruby 3.4.0 # or rbenv shell 3.4.0, or rvm use 3.4.0, etc.
-BUNDLE_GEMFILE=gemfiles/Gemfile-rails-8-0 bundle install
-BUNDLE_GEMFILE=gemfiles/Gemfile-rails-8-0 bin/test
+rbenv shell 2.4.2 # or rvm use 2.4.2
+BUNDLE_GEMFILE=gemfiles/Gemfile.rails-4.1-stable bundle install
+BUNDLE_GEMFILE=gemfiles/Gemfile.rails-4.1-stable bin/test
 ```

 You can also combine both of them if the tests broke for Mongoid:
 ```bash
-BUNDLE_GEMFILE=gemfiles/Gemfile-rails-8-0 bundle install
-BUNDLE_GEMFILE=gemfiles/Gemfile-rails-8-0 DEVISE_ORM=mongoid bin/test
+BUNDLE_GEMFILE=gemfiles/Gemfile.rails-4.1-stable bundle install
+BUNDLE_GEMFILE=gemfiles/Gemfile.rails-4.1-stable DEVISE_ORM=mongoid bin/test
 ```

 ### Running tests
@@ -163,10 +155,9 @@ bin/test
 bin/test test/models/trackable_test.rb
 ```

-* Running a specific test given a line number or a regex:
+* Running a specific test given a regex:
 ```bash
 bin/test test/models/trackable_test.rb:16
-bin/test test/models/trackable_test.rb -n '/update.*record/'
 ```

 ## Starting with Rails?
@@ -181,16 +172,18 @@ Once you have solidified your understanding of Rails and authentication mechanis

 ## Getting started

-Devise 5 works with Rails 7 onwards. Run:
+Devise 4.0 works with Rails 4.1 onwards. Add the following line to your Gemfile:

-```sh
-bundle add devise
+```ruby
+gem 'devise'
 ```

+Then run `bundle install`
+
 Next, you need to run the generator:

 ```console
-rails generate devise:install
+$ rails generate devise:install
 ```

 At this point, a number of instructions will appear in the console. Among these instructions, you'll need to set up the default URL options for the Devise mailer in each environment. Here is a possible configuration for `config/environments/development.rb`:
@@ -205,7 +198,7 @@ The generator will install an initializer which describes ALL of Devise's config
 In the following command you will replace `MODEL` with the class name used for the application’s users (it’s frequently `User` but could also be `Admin`). This will create a model (if one does not exist) and configure it with the default Devise modules. The generator also configures your `config/routes.rb` file to point to the Devise controller.

 ```console
-rails generate devise MODEL
+$ rails generate devise MODEL
 ```

 Next, check the MODEL for any additional configuration options you might want to add, such as confirmable or lockable. If you add an option, be sure to inspect the migration file (created by the generator if your ORM supports them) and uncomment the appropriate section.  For example, if you add the confirmable option in the model, you'll need to uncomment the Confirmable section in the migration.
@@ -377,7 +370,7 @@ We built Devise to help you quickly develop an application that uses authenticat
 Since Devise is an engine, all its views are packaged inside the gem. These views will help you get started, but after some time you may want to change them. If this is the case, you just need to invoke the following generator, and it will copy all views to your application:

 ```console
-rails generate devise:views
+$ rails generate devise:views
 ```

 If you have more than one Devise model in your application (such as `User` and `Admin`), you will notice that Devise uses the same views for all models. Fortunately, Devise offers an easy way to customize views. All you need to do is set `config.scoped_views = true` inside the `config/initializers/devise.rb` file.
@@ -385,14 +378,14 @@ If you have more than one Devise model in your application (such as `User` and `
 After doing so, you will be able to have views based on the role like `users/sessions/new` and `admins/sessions/new`. If no view is found within the scope, Devise will use the default view at `devise/sessions/new`. You can also use the generator to generate scoped views:

 ```console
-rails generate devise:views users
+$ rails generate devise:views users
 ```

 If you would like to generate only a few sets of views, like the ones for the `registerable` and `confirmable` module,
 you can pass a list of views to the generator with the `-v` flag.

 ```console
-rails generate devise:views -v registrations confirmations
+$ rails generate devise:views -v registrations confirmations
 ```

 ### Configuring controllers
@@ -402,7 +395,7 @@ If the customization at the views level is not enough, you can customize each co
 1. Create your custom controllers using the generator which requires a scope:

    ```console
-    rails generate devise:controllers [scope]
+    $ rails generate devise:controllers [scope]
    ```

    If you specify `users` as the scope, controllers will be created in `app/controllers/users/`.
@@ -417,7 +410,7 @@ If the customization at the views level is not enough, you can customize each co
      ...
    end
    ```
-    Use the `-c` flag to specify one or more controllers, for example: `rails generate devise:controllers users -c sessions`
+    Use the `-c` flag to specify one or more controllers, for example: `rails generate devise:controllers users -c sessions`)

 2. Tell the router to use this controller:

@@ -463,7 +456,7 @@ Devise also ships with default routes. If you need to customize them, you should
 devise_for :users, path: 'auth', path_names: { sign_in: 'login', sign_out: 'logout', password: 'secret', confirmation: 'verification', unlock: 'unblock', registration: 'register', sign_up: 'cmon_let_me_in' }
 ```

-Be sure to check `devise_for` [documentation](https://www.rubydoc.info/gems/devise/ActionDispatch/Routing/Mapper#devise_for-instance_method) for details.
+Be sure to check `devise_for` [documentation](http://www.rubydoc.info/github/heartcombo/devise/main/ActionDispatch/Routing/Mapper%3Adevise_for) for details.

 If you have the need for more deep customization, for instance to also allow "/sign_in" besides "/users/sign_in", all you need to do is create your routes normally and wrap them in a `devise_scope` block in the router:

@@ -493,8 +486,7 @@ Devise.setup do |config|
  # apps is `200 OK` and `302 Found` respectively, but new apps are generated with
  # these new defaults that match Hotwire/Turbo behavior.
  # Note: These might become the new default in future versions of Devise.
-  config.responder.error_status = :unprocessable_content # for Rack 3.1 or higher
-  # config.responder.error_status = :unprocessable_entity # for Rack 3.0 or lower
+  config.responder.error_status = :unprocessable_entity
  config.responder.redirect_status = :see_other
 end
 ```
@@ -654,7 +646,7 @@ Unlike controller tests, integration tests do not need to supply the
 `devise.mapping` `env` value, as the mapping can be inferred by the routes that
 are executed in your tests.

-You can read more about testing your Rails controllers with RSpec in the wiki:
+You can read more about testing your Rails 3 - Rails 4 controllers with RSpec in the wiki:

 * https://github.com/heartcombo/devise/wiki/How-To:-Test-controllers-with-Rails-(and-RSpec)

@@ -701,9 +693,9 @@ Alternatively, you can simply run the Devise generator.

 Keep in mind that those models will have completely different routes. They **do not** and **cannot** share the same controller for sign in, sign out and so on. In case you want to have different roles sharing the same actions, we recommend that you use a role-based approach, by either providing a role column or using a dedicated gem for authorization.

-### Active Job Integration
+### ActiveJob Integration

-If you are using Active Job to deliver Action Mailer messages in the
+If you are using Rails 4.2 and ActiveJob to deliver ActionMailer messages in the
 background through a queuing back-end, you can send Devise emails through your
 existing queue by overriding the `send_devise_notification` method in your model.

@@ -715,7 +707,7 @@ end

 ### Password reset tokens and Rails logs

-If you enable the [Recoverable](https://www.rubydoc.info/gems/devise/Devise/Models/Recoverable) module, note that a stolen password reset token could give an attacker access to your application. Devise takes effort to generate random, secure tokens, and stores only token digests in the database, never plaintext. However the default logging behavior in Rails can cause plaintext tokens to leak into log files:
+If you enable the [Recoverable](http://rubydoc.info/github/heartcombo/devise/main/Devise/Models/Recoverable) module, note that a stolen password reset token could give an attacker access to your application. Devise takes effort to generate random, secure tokens, and stores only token digests in the database, never plaintext. However the default logging behavior in Rails can cause plaintext tokens to leak into log files:

 1. Action Mailer logs the entire contents of all outgoing emails to the DEBUG level. Password reset tokens delivered to users in email will be leaked.
 2. Active Job logs all arguments to every enqueued job at the INFO level. If you configure Devise to use `deliver_later` to send password reset emails, password reset tokens will be leaked.
@@ -767,10 +759,14 @@ Devise is based on Warden, which is a general Rack authentication framework crea

 https://github.com/wardencommunity/warden

+### Contributors
+
+We have a long list of valued contributors. Check them all at:
+
+https://github.com/heartcombo/devise/graphs/contributors
+
 ## License

-MIT License.
-Copyright 2020-CURRENT Rafael França, Carlos Antonio da Silva.
-Copyright 2009-2019 Plataformatec.
+MIT License. Copyright 2020-2024 Rafael França, Leonardo Tegon, Carlos Antônio da Silva. Copyright 2009-2019 Plataformatec.

 The Devise logo is licensed under [Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International License](https://creativecommons.org/licenses/by-nc-nd/4.0/).
--- a/app/controllers/devise/confirmations_controller.rb
+++ b/app/controllers/devise/confirmations_controller.rb
@@ -27,7 +27,7 @@ class Devise::ConfirmationsController < DeviseController
      set_flash_message!(:notice, :confirmed)
      respond_with_navigational(resource){ redirect_to after_confirmation_path_for(resource_name, resource) }
    else
-      # TODO: use `error_status` when the default changes to `:unprocessable_entity` / `:unprocessable_content`.
+      # TODO: use `error_status` when the default changes to `:unprocessable_entity`.
      respond_with_navigational(resource.errors, status: :unprocessable_entity){ render :new }
    end
  end
--- a/app/controllers/devise/sessions_controller.rb
+++ b/app/controllers/devise/sessions_controller.rb
@@ -28,7 +28,7 @@ class Devise::SessionsController < DeviseController
    signed_out = (Devise.sign_out_all_scopes ? sign_out : sign_out(resource_name))
    set_flash_message! :notice, :signed_out if signed_out
    yield if block_given?
-    respond_to_on_destroy(non_navigational_status: :no_content)
+    respond_to_on_destroy
  end

  protected
@@ -62,7 +62,7 @@ class Devise::SessionsController < DeviseController
    if all_signed_out?
      set_flash_message! :notice, :already_signed_out

-      respond_to_on_destroy(non_navigational_status: :unauthorized)
+      respond_to_on_destroy
    end
  end

@@ -72,11 +72,11 @@ class Devise::SessionsController < DeviseController
    users.all?(&:blank?)
  end

-  def respond_to_on_destroy(non_navigational_status: :no_content)
+  def respond_to_on_destroy
    # We actually need to hardcode this as Rails default responder doesn't
    # support returning empty response on GET request
    respond_to do |format|
-      format.all { head non_navigational_status }
+      format.all { head :no_content }
      format.any(*navigational_formats) { redirect_to after_sign_out_path_for(resource_name), status: Devise.responder.redirect_status }
    end
  end
--- a/app/controllers/devise/unlocks_controller.rb
+++ b/app/controllers/devise/unlocks_controller.rb
@@ -29,7 +29,7 @@ class Devise::UnlocksController < DeviseController
      set_flash_message! :notice, :unlocked
      respond_with_navigational(resource){ redirect_to after_unlock_path_for(resource) }
    else
-      # TODO: use `error_status` when the default changes to `:unprocessable_entity` / `:unprocessable_content`.
+      # TODO: use `error_status` when the default changes to `:unprocessable_entity`.
      respond_with_navigational(resource.errors, status: :unprocessable_entity){ render :new }
    end
  end
--- a/app/helpers/devise_helper.rb
+++ b/app/helpers/devise_helper.rb
@@ -1,5 +1,30 @@
 # frozen_string_literal: true

-# Keeping the helper around for backward compatibility.
 module DeviseHelper
+  # Retain this method for backwards compatibility, deprecated in favor of modifying the
+  # devise/shared/error_messages partial.
+  def devise_error_messages!
+    Devise.deprecator.warn <<-DEPRECATION.strip_heredoc
+      [Devise] `DeviseHelper#devise_error_messages!` is deprecated and will be
+      removed in the next major version.
+
+      Devise now uses a partial under "devise/shared/error_messages" to display
+      error messages by default, and make them easier to customize. Update your
+      views changing calls from:
+
+          <%= devise_error_messages! %>
+
+      to:
+
+          <%= render "devise/shared/error_messages", resource: resource %>
+
+      To start customizing how errors are displayed, you can copy the partial
+      from devise to your `app/views` folder. Alternatively, you can run
+      `rails g devise:views` which will copy all of them again to your app.
+    DEPRECATION
+
+    return "" if resource.errors.empty?
+
+    render "devise/shared/error_messages", resource: resource
+  end
 end
--- a/app/views/devise/confirmations/new.html.erb
+++ b/app/views/devise/confirmations/new.html.erb
@@ -4,8 +4,8 @@
  <%= render "devise/shared/error_messages", resource: resource %>

  <div class="field">
-    <p><%= f.label :email %></p>
-    <p><%= f.email_field :email, autofocus: true, autocomplete: "email", value: (resource.pending_reconfirmation? ? resource.unconfirmed_email : resource.email) %></p>
+    <%= f.label :email %><br />
+    <%= f.email_field :email, autofocus: true, autocomplete: "email", value: (resource.pending_reconfirmation? ? resource.unconfirmed_email : resource.email) %>
  </div>

  <div class="actions">
--- a/app/views/devise/passwords/edit.html.erb
+++ b/app/views/devise/passwords/edit.html.erb
@@ -5,16 +5,16 @@
  <%= f.hidden_field :reset_password_token %>

  <div class="field">
-    <p><%= f.label :password, "New password" %></p>
+    <%= f.label :password, "New password" %><br />
    <% if @minimum_password_length %>
-      <p><em>(<%= @minimum_password_length %> characters minimum)</em></p>
+      <em>(<%= @minimum_password_length %> characters minimum)</em><br />
    <% end %>
-    <p><%= f.password_field :password, autofocus: true, autocomplete: "new-password" %></p>
+    <%= f.password_field :password, autofocus: true, autocomplete: "new-password" %>
  </div>

  <div class="field">
-    <p><%= f.label :password_confirmation, "Confirm new password" %></p>
-    <p><%= f.password_field :password_confirmation, autocomplete: "new-password" %></p>
+    <%= f.label :password_confirmation, "Confirm new password" %><br />
+    <%= f.password_field :password_confirmation, autocomplete: "new-password" %>
  </div>

  <div class="actions">
--- a/app/views/devise/passwords/new.html.erb
+++ b/app/views/devise/passwords/new.html.erb
@@ -4,12 +4,12 @@
  <%= render "devise/shared/error_messages", resource: resource %>

  <div class="field">
-    <p><%= f.label :email %></p>
-    <p><%= f.email_field :email, autofocus: true, autocomplete: "email" %></p>
+    <%= f.label :email %><br />
+    <%= f.email_field :email, autofocus: true, autocomplete: "email" %>
  </div>

  <div class="actions">
-    <%= f.submit "Send me password reset instructions" %>
+    <%= f.submit "Send me reset password instructions" %>
  </div>
 <% end %>

--- a/app/views/devise/registrations/edit.html.erb
+++ b/app/views/devise/registrations/edit.html.erb
@@ -4,8 +4,8 @@
  <%= render "devise/shared/error_messages", resource: resource %>

  <div class="field">
-    <p><%= f.label :email %></p>
-    <p><%= f.email_field :email, autofocus: true, autocomplete: "email" %></p>
+    <%= f.label :email %><br />
+    <%= f.email_field :email, autofocus: true, autocomplete: "email" %>
  </div>

  <% if devise_mapping.confirmable? && resource.pending_reconfirmation? %>
@@ -13,21 +13,22 @@
  <% end %>

  <div class="field">
-    <p><%= f.label :password %> <i>(leave blank if you don't want to change it)</i></p>
-    <p><%= f.password_field :password, autocomplete: "new-password" %></p>
+    <%= f.label :password %> <i>(leave blank if you don't want to change it)</i><br />
+    <%= f.password_field :password, autocomplete: "new-password" %>
    <% if @minimum_password_length %>
-      <p><em><%= @minimum_password_length %> characters minimum</em></p>
+      <br />
+      <em><%= @minimum_password_length %> characters minimum</em>
    <% end %>
  </div>

  <div class="field">
-    <p><%= f.label :password_confirmation %></p>
-    <p><%= f.password_field :password_confirmation, autocomplete: "new-password" %></p>
+    <%= f.label :password_confirmation %><br />
+    <%= f.password_field :password_confirmation, autocomplete: "new-password" %>
  </div>

  <div class="field">
-    <p><%= f.label :current_password %> <i>(we need your current password to confirm your changes)</i></p>
-    <p><%= f.password_field :current_password, autocomplete: "current-password" %></p>
+    <%= f.label :current_password %> <i>(we need your current password to confirm your changes)</i><br />
+    <%= f.password_field :current_password, autocomplete: "current-password" %>
  </div>

  <div class="actions">
--- a/app/views/devise/registrations/new.html.erb
+++ b/app/views/devise/registrations/new.html.erb
@@ -4,21 +4,21 @@
  <%= render "devise/shared/error_messages", resource: resource %>

  <div class="field">
-    <p><%= f.label :email %></p>
-    <p><%= f.email_field :email, autofocus: true, autocomplete: "email" %></p>
+    <%= f.label :email %><br />
+    <%= f.email_field :email, autofocus: true, autocomplete: "email" %>
  </div>

  <div class="field">
-    <p><%= f.label :password %></p>
+    <%= f.label :password %>
    <% if @minimum_password_length %>
-      <p><em>(<%= @minimum_password_length %> characters minimum)</em></p>
-    <% end %>
-    <p><%= f.password_field :password, autocomplete: "new-password" %></p>
+    <em>(<%= @minimum_password_length %> characters minimum)</em>
+    <% end %><br />
+    <%= f.password_field :password, autocomplete: "new-password" %>
  </div>

  <div class="field">
-    <p><%= f.label :password_confirmation %></p>
-    <p><%= f.password_field :password_confirmation, autocomplete: "new-password" %></p>
+    <%= f.label :password_confirmation %><br />
+    <%= f.password_field :password_confirmation, autocomplete: "new-password" %>
  </div>

  <div class="actions">
--- a/app/views/devise/sessions/new.html.erb
+++ b/app/views/devise/sessions/new.html.erb
@@ -2,19 +2,19 @@

 <%= form_for(resource, as: resource_name, url: session_path(resource_name)) do |f| %>
  <div class="field">
-    <p><%= f.label :email %></p>
-    <p><%= f.email_field :email, autofocus: true, autocomplete: "email" %></p>
+    <%= f.label :email %><br />
+    <%= f.email_field :email, autofocus: true, autocomplete: "email" %>
  </div>

  <div class="field">
-    <p><%= f.label :password %></p>
-    <p><%= f.password_field :password, autocomplete: "current-password" %></p>
+    <%= f.label :password %><br />
+    <%= f.password_field :password, autocomplete: "current-password" %>
  </div>

  <% if devise_mapping.rememberable? %>
    <div class="field">
-      <p><%= f.check_box :remember_me %></p>
-      <p><%= f.label :remember_me %></p>
+      <%= f.check_box :remember_me %>
+      <%= f.label :remember_me %>
    </div>
  <% end %>

--- a/app/views/devise/shared/_error_messages.html.erb
+++ b/app/views/devise/shared/_error_messages.html.erb
@@ -1,5 +1,5 @@
 <% if resource.errors.any? %>
-  <div id="error_explanation" data-turbo-temporary>
+  <div id="error_explanation" data-turbo-cache="false">
    <h2>
      <%= I18n.t("errors.messages.not_saved",
                 count: resource.errors.count,
--- a/app/views/devise/shared/_links.html.erb
+++ b/app/views/devise/shared/_links.html.erb
@@ -1,25 +1,25 @@
 <%- if controller_name != 'sessions' %>
-  <p><%= link_to "Log in", new_session_path(resource_name) %></p>
+  <%= link_to "Log in", new_session_path(resource_name) %><br />
 <% end %>

 <%- if devise_mapping.registerable? && controller_name != 'registrations' %>
-  <p><%= link_to "Sign up", new_registration_path(resource_name) %></p>
+  <%= link_to "Sign up", new_registration_path(resource_name) %><br />
 <% end %>

 <%- if devise_mapping.recoverable? && controller_name != 'passwords' && controller_name != 'registrations' %>
-  <p><%= link_to "Forgot your password?", new_password_path(resource_name) %></p>
+  <%= link_to "Forgot your password?", new_password_path(resource_name) %><br />
 <% end %>

 <%- if devise_mapping.confirmable? && controller_name != 'confirmations' %>
-  <p><%= link_to "Didn't receive confirmation instructions?", new_confirmation_path(resource_name) %></p>
+  <%= link_to "Didn't receive confirmation instructions?", new_confirmation_path(resource_name) %><br />
 <% end %>

 <%- if devise_mapping.lockable? && resource_class.unlock_strategy_enabled?(:email) && controller_name != 'unlocks' %>
-  <p><%= link_to "Didn't receive unlock instructions?", new_unlock_path(resource_name) %></p>
+  <%= link_to "Didn't receive unlock instructions?", new_unlock_path(resource_name) %><br />
 <% end %>

 <%- if devise_mapping.omniauthable? %>
  <%- resource_class.omniauth_providers.each do |provider| %>
-    <p><%= button_to "Sign in with #{OmniAuth::Utils.camelize(provider)}", omniauth_authorize_path(resource_name, provider), data: { turbo: false } %></p>
+    <%= button_to "Sign in with #{OmniAuth::Utils.camelize(provider)}", omniauth_authorize_path(resource_name, provider), data: { turbo: false } %><br />
  <% end %>
 <% end %>
--- a/app/views/devise/unlocks/new.html.erb
+++ b/app/views/devise/unlocks/new.html.erb
@@ -4,8 +4,8 @@
  <%= render "devise/shared/error_messages", resource: resource %>

  <div class="field">
-    <p><%= f.label :email %></p>
-    <p><%= f.email_field :email, autofocus: true, autocomplete: "email" %></p>
+    <%= f.label :email %><br />
+    <%= f.email_field :email, autofocus: true, autocomplete: "email" %>
  </div>

  <div class="actions">
--- a/bin/test
+++ b/bin/test
@@ -1,12 +1,17 @@
 #!/usr/bin/env ruby
 $: << File.expand_path(File.expand_path('../../test', __FILE__))

-require 'bundler/setup'
-require 'rails/test_unit/runner'
-require 'rails/test_unit/reporter'
-require 'rails/test_unit/line_filtering'
+# Remove this begin/rescue once Rails 4 support is removed.
+begin
+  require 'bundler/setup'
+  require 'rails/test_unit/runner'
+  require 'rails/test_unit/reporter'
+  require 'rails/test_unit/line_filtering'

-Rails::TestUnitReporter.executable = 'bin/test'
+  Rails::TestUnitReporter.executable = 'bin/test'

-Rails::TestUnit::Runner.parse_options(ARGV)
-Rails::TestUnit::Runner.run(ARGV)
+  Rails::TestUnit::Runner.parse_options(ARGV)
+  Rails::TestUnit::Runner.run(ARGV)
+rescue LoadError
+  exec 'rake'
+end
--- a/devise.gemspec
+++ b/devise.gemspec
@@ -10,7 +10,7 @@ Gem::Specification.new do |s|
  s.platform    = Gem::Platform::RUBY
  s.licenses    = ["MIT"]
  s.summary     = "Flexible authentication solution for Rails with Warden"
-  s.email       = "heartcombo.oss@gmail.com"
+  s.email       = "heartcombo@googlegroups.com"
  s.homepage    = "https://github.com/heartcombo/devise"
  s.description = "Flexible authentication solution for Rails with Warden"
  s.authors     = ['José Valim', 'Carlos Antônio']
@@ -25,11 +25,18 @@ Gem::Specification.new do |s|

  s.files         = Dir["{app,config,lib}/**/*", "CHANGELOG.md", "MIT-LICENSE", "README.md"]
  s.require_paths = ["lib"]
-  s.required_ruby_version = '>= 2.7.0'
+  s.required_ruby_version = '>= 2.1.0'

  s.add_dependency("warden", "~> 1.2.3")
  s.add_dependency("orm_adapter", "~> 0.1")
  s.add_dependency("bcrypt", "~> 3.0")
-  s.add_dependency("railties", ">= 7.0")
+  s.add_dependency("railties", ">= 4.1.0")
  s.add_dependency("responders")
+
+  s.post_install_message = %q{
+[DEVISE] Please review the [changelog] and [upgrade guide] for more info on Hotwire / Turbo integration.
+
+  [changelog] https://github.com/heartcombo/devise/blob/main/CHANGELOG.md
+  [upgrade guide] https://github.com/heartcombo/devise/wiki/How-To:-Upgrade-to-Devise-4.9.0-%5BHotwire-Turbo-integration%5D
+  }
 end
--- a/gemfiles/Gemfile-rails-4-1
+++ b/gemfiles/Gemfile-rails-4-1
@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+source "https://rubygems.org"
+
+git_source(:github) do |repo_name|
+  repo_name = "#{repo_name}/#{repo_name}" unless repo_name.include?('/')
+  "https://github.com/#{repo_name}.git"
+end
+
+gemspec path: ".."
+
+gem "rails", github: "rails/rails", branch: "4-1-stable"
+gem "omniauth"
+gem "omniauth-oauth2"
+gem "rdoc", "~> 5.1"
+# Force this version because it's breaking on CI since a higher nokogiri version requires Ruby 2.3+.
+gem "nokogiri", "1.9.1"
+
+group :test do
+  gem "omniauth-facebook"
+  gem "omniauth-openid"
+  gem "timecop"
+  gem "webrat", "0.7.3", require: false
+  gem "mocha", "~> 2.1", require: false
+  gem 'test_after_commit', require: false
+end
+
+platforms :jruby do
+  gem "activerecord-jdbc-adapter"
+  gem "activerecord-jdbcsqlite3-adapter"
+  gem "jruby-openssl"
+end
+
+platforms :ruby do
+  gem "sqlite3", "~> 1.3.6"
+end
+
+group :mongoid do
+  gem "mongoid", "~> 4.0"
+end
+
+if RUBY_VERSION < "2.3.0"
+  # We're getting version 2.2.0 which doesn't play nice with Ruby 2.2, using
+  # `Object.deprecate_constant` which isn't available.
+  gem "multipart-post", "2.1.1"
+end
+
+# There's a build incompatibility issue with nokogiri and loofah
+gem "loofah", "~> 2.20.0"
--- a/gemfiles/Gemfile-rails-4-2
+++ b/gemfiles/Gemfile-rails-4-2
@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+source "https://rubygems.org"
+
+git_source(:github) do |repo_name|
+  repo_name = "#{repo_name}/#{repo_name}" unless repo_name.include?('/')
+  "https://github.com/#{repo_name}.git"
+end
+
+gemspec path: ".."
+
+gem "rails", github: "rails/rails", branch: "4-2-stable"
+gem "omniauth"
+gem "omniauth-oauth2"
+gem "rdoc", "~> 5.1"
+gem "nokogiri", "1.9.1"
+
+group :test do
+  gem "omniauth-facebook"
+  gem "omniauth-openid"
+  gem "timecop"
+  gem "webrat", "0.7.3", require: false
+  gem "mocha", "~> 2.1", require: false
+  gem 'test_after_commit', require: false
+end
+
+platforms :jruby do
+  gem "activerecord-jdbc-adapter"
+  gem "activerecord-jdbcsqlite3-adapter"
+  gem "jruby-openssl"
+end
+
+platforms :ruby do
+  gem "sqlite3", "~> 1.3.6"
+end
+
+group :mongoid do
+  gem "mongoid", "~> 4.0"
+end
+
+if RUBY_VERSION < "2.3.0"
+  # We're getting version 2.2.0 which doesn't play nice with Ruby 2.2, using
+  # `Object.deprecate_constant` which isn't available.
+  gem "multipart-post", "2.1.1"
+end
+
+# There's a build incompatibility issue with nokogiri and loofah
+gem "loofah", "~> 2.20.0"
--- a/gemfiles/Gemfile-rails-5-0
+++ b/gemfiles/Gemfile-rails-5-0
@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+source "https://rubygems.org"
+
+gemspec path: ".."
+
+gem "rails", '~> 5.0.0'
+gem "omniauth"
+gem "omniauth-oauth2"
+gem "rdoc"
+
+gem "rails-controller-testing"
+
+gem "responders", "~> 2.1"
+
+group :test do
+  gem "omniauth-facebook"
+  gem "omniauth-openid"
+  gem "timecop"
+  gem "webrat", "0.7.3", require: false
+  gem "mocha", "~> 2.1", require: false
+end
+
+platforms :ruby do
+  gem "sqlite3", "~> 1.3.6"
+end
+
+# TODO:
+# group :mongoid do
+#   gem "mongoid", "~> 4.0.0"
+# end
+
+if RUBY_VERSION < "2.3.0"
+  # We're getting version 2.2.0 which doesn't play nice with Ruby 2.2, using
+  # `Object.deprecate_constant` which isn't available.
+  gem "multipart-post", "2.1.1"
+end
+
+# There's a build incompatibility issue with nokogiri and loofah
+gem "loofah", "~> 2.20.0"
--- a/gemfiles/Gemfile-rails-5-1
+++ b/gemfiles/Gemfile-rails-5-1
@@ -0,0 +1,33 @@
+source "https://rubygems.org"
+
+gemspec path: ".."
+
+gem "rails", '~> 5.1.0'
+gem "omniauth"
+gem "omniauth-oauth2"
+gem "rdoc"
+
+gem "rails-controller-testing"
+
+gem "responders", "~> 2.1"
+
+group :test do
+  gem "omniauth-facebook"
+  gem "omniauth-openid"
+  gem "timecop"
+  gem "webrat", "0.7.3", require: false
+  gem "mocha", "~> 2.1", require: false
+end
+
+platforms :ruby do
+  gem "sqlite3", "~> 1.3.6"
+end
+
+if RUBY_VERSION < "2.3.0"
+  # We're getting version 2.2.0 which doesn't play nice with Ruby 2.2, using
+  # `Object.deprecate_constant` which isn't available.
+  gem "multipart-post", "2.1.1"
+end
+
+# There's a build incompatibility issue with nokogiri and loofah
+gem "loofah", "~> 2.20.0"
--- a/gemfiles/Gemfile-rails-5-2
+++ b/gemfiles/Gemfile-rails-5-2
@@ -2,31 +2,26 @@ source "https://rubygems.org"

 gemspec path: ".."

-gem "rails", "~> 7.1.0"
-
+gem "rails", '~> 5.2.0'
 gem "omniauth"
 gem "omniauth-oauth2"
 gem "rdoc"

 gem "rails-controller-testing"

-gem "responders", "~> 3.1"
+gem "responders", "~> 2.1"

 group :test do
  gem "omniauth-facebook"
  gem "omniauth-openid"
-  gem "rexml"
  gem "timecop"
-  gem "webrat", require: false
+  gem "webrat", "0.7.3", require: false
  gem "mocha", "~> 2.1", require: false
-  gem "minitest", "< 6"
-  gem "ostruct"
 end

 platforms :ruby do
-  gem "sqlite3"
+  gem "sqlite3", "~> 1.3.6"
 end

-group :mongoid do
-  gem "mongoid", "~> 8.1"
-end
+# There's a build incompatibility issue with nokogiri and loofah
+gem "loofah", "~> 2.20.0"
--- a/gemfiles/Gemfile-rails-6-0
+++ b/gemfiles/Gemfile-rails-6-0
@@ -2,12 +2,12 @@ source "https://rubygems.org"

 gemspec path: ".."

-gem "rails", "~> 7.1.0"
+gem "rails", '~> 6.0.0', github: 'rails/rails', branch: '6-0-stable'
 gem "omniauth"
 gem "omniauth-oauth2"
 gem "rdoc"

-gem "rails-controller-testing"
+gem "rails-controller-testing", github: "rails/rails-controller-testing"

 gem "responders", "~> 3.1"

@@ -16,16 +16,10 @@ group :test do
  gem "omniauth-openid"
  gem "rexml"
  gem "timecop"
-  gem "webrat"
+  gem "webrat", "0.7.3", require: false
  gem "mocha", "~> 2.1", require: false
-  gem "minitest", "< 6"
-  gem "ostruct"
 end

 platforms :ruby do
  gem "sqlite3", "~> 1.4"
 end
-
-group :mongoid do
-  gem "mongoid", "~> 8.1"
-end
--- a/gemfiles/Gemfile-rails-6-1
+++ b/gemfiles/Gemfile-rails-6-1
@@ -2,30 +2,30 @@ source "https://rubygems.org"

 gemspec path: ".."

-gem "rails", "~> 8.0.0"
+gem "rails", '~> 6.1.0'
 gem "omniauth"
 gem "omniauth-oauth2"
 gem "rdoc"

-gem "rails-controller-testing"
+gem "rails-controller-testing", github: "rails/rails-controller-testing"

 gem "responders", "~> 3.1"

+if RUBY_VERSION >= "3.1"
+  gem "net-smtp", require: false
+  gem "net-imap", require: false
+  gem "net-pop", require: false
+end
+
 group :test do
  gem "omniauth-facebook"
  gem "omniauth-openid"
  gem "rexml"
  gem "timecop"
-  gem 'webrat'
+  gem "webrat", "0.7.3", require: false
  gem "mocha", "~> 2.1", require: false
-  gem "minitest", "< 6"
-  gem "ostruct"
 end

 platforms :ruby do
-  gem "sqlite3"
-end
-
-group :mongoid do
-  gem "mongoid", "~> 8.1"
+  gem "sqlite3", "~> 1.4"
 end
--- a/gemfiles/Gemfile-rails-7-0
+++ b/gemfiles/Gemfile-rails-7-0
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source "https://rubygems.org"

 gemspec path: ".."
@@ -7,7 +9,7 @@ gem "omniauth"
 gem "omniauth-oauth2"
 gem "rdoc"

-gem "rails-controller-testing"
+gem "rails-controller-testing", github: "rails/rails-controller-testing"

 gem "responders", "~> 3.1"

@@ -18,14 +20,19 @@ group :test do
  gem "timecop"
  gem "webrat", "0.7.3", require: false
  gem "mocha", "~> 2.1", require: false
-  gem "minitest", "< 6"
-  gem "ostruct"
 end

 platforms :ruby do
  gem "sqlite3", "~> 1.4"
 end

-group :mongoid do
-  gem "mongoid", "~> 7.5"
-end
+# platforms :jruby do
+#   gem "activerecord-jdbc-adapter"
+#   gem "activerecord-jdbcsqlite3-adapter"
+#   gem "jruby-openssl"
+# end
+
+# TODO:
+# group :mongoid do
+#   gem "mongoid", "~> 4.0.0"
+# end
--- a/gemfiles/Gemfile-rails-main
+++ b/gemfiles/Gemfile-rails-main
@@ -7,7 +7,7 @@ gem "omniauth"
 gem "omniauth-oauth2"
 gem "rdoc"

-gem "rails-controller-testing"
+gem "rails-controller-testing", github: "rails/rails-controller-testing"

 gem "responders", "~> 3.1"

@@ -18,14 +18,8 @@ group :test do
  gem "timecop"
  gem "webrat", "0.7.3", require: false
  gem "mocha", "~> 2.1", require: false
-  gem "minitest", "< 6"
-  gem "ostruct"
 end

 platforms :ruby do
-  gem "sqlite3"
-end
-
-group :mongoid do
-  gem "mongoid", github: "mongodb/mongoid", branch: "master"
+  gem "sqlite3", "~> 1.4"
 end
--- a/lib/devise.rb
+++ b/lib/devise.rb
@@ -16,8 +16,10 @@ module Devise
  autoload :Orm,                'devise/orm'
  autoload :ParameterFilter,    'devise/parameter_filter'
  autoload :ParameterSanitizer, 'devise/parameter_sanitizer'
+  autoload :TestHelpers,        'devise/test_helpers'
  autoload :TimeInflector,      'devise/time_inflector'
  autoload :TokenGenerator,     'devise/token_generator'
+  autoload :SecretKeyFinder,    'devise/secret_key_finder'

  module Controllers
    autoload :Helpers,        'devise/controllers/helpers'
@@ -59,7 +61,7 @@ module Devise
  NO_INPUT = []

  # True values used to check params
-  TRUE_VALUES = [true, 1, '1', 'on', 'ON', 't', 'T', 'true', 'TRUE']
+  TRUE_VALUES = [true, 1, '1', 't', 'T', 'true', 'TRUE']

  # Secret key used by the key generator
  mattr_accessor :secret_key
@@ -273,14 +275,8 @@ module Devise
  # PRIVATE CONFIGURATION

  # Store scopes mappings.
+  mattr_reader :mappings
  @@mappings = {}
-  def self.mappings
-    # Starting from Rails 8.0, routes are lazy-loaded by default in test and development environments.
-    # However, Devise's mappings are built during the routes loading phase.
-    # To ensure it works correctly, we need to load the routes first before accessing @@mappings.
-    Rails.application.try(:reload_routes_unless_loaded)
-    @@mappings
-  end

  # OmniAuth configurations.
  mattr_reader :omniauth_configs
@@ -445,9 +441,9 @@ module Devise
  #  Devise.setup do |config|
  #    config.allow_unconfirmed_access_for = 2.days
  #
-  #    config.warden do |warden_config|
+  #    config.warden do |manager|
  #      # Configure warden to use other strategies, like oauth.
-  #      warden_config.oauth(:twitter)
+  #      manager.oauth(:twitter)
  #    end
  #  end
  def self.warden(&block)
@@ -517,13 +513,25 @@ module Devise

  # constant-time comparison algorithm to prevent timing attacks
  def self.secure_compare(a, b)
-    return false if a.nil? || b.nil?
-    ActiveSupport::SecurityUtils.secure_compare(a, b)
+    return false if a.blank? || b.blank? || a.bytesize != b.bytesize
+    l = a.unpack "C#{a.bytesize}"
+
+    res = 0
+    b.each_byte { |byte| res |= byte ^ l.shift }
+    res == 0
  end

  def self.deprecator
    @deprecator ||= ActiveSupport::Deprecation.new("5.0", "Devise")
  end
+
+  def self.activerecord51? # :nodoc:
+    deprecator.warn <<-DEPRECATION.strip_heredoc
+      [Devise] `Devise.activerecord51?` is deprecated and will be removed in the next major version.
+      It is a non-public method that's no longer used internally, but that other libraries have been relying on.
+    DEPRECATION
+    defined?(ActiveRecord) && ActiveRecord.gem_version >= Gem::Version.new("5.1.x")
+  end
 end

 require 'warden'
--- a/lib/devise/controllers/sign_in_out.rb
+++ b/lib/devise/controllers/sign_in_out.rb
@@ -37,7 +37,16 @@ module Devise

        expire_data_after_sign_in!

-        if warden.user(scope) == resource && !options.delete(:force)
+        if options[:bypass]
+          Devise.deprecator.warn(<<-DEPRECATION.strip_heredoc, caller)
+          [Devise] bypass option is deprecated and it will be removed in future version of Devise.
+          Please use bypass_sign_in method instead.
+          Example:
+
+            bypass_sign_in(user)
+          DEPRECATION
+          warden.session_serializer.store(resource, scope)
+        elsif warden.user(scope) == resource && !options.delete(:force)
          # Do nothing. User already signed in and we are not forcing it.
          true
        else
@@ -97,6 +106,12 @@ module Devise
      private

      def expire_data_after_sign_in!
+        # TODO: remove once Rails 5.2+ and forward are only supported.
+        # session.keys will return an empty array if the session is not yet loaded.
+        # This is a bug in both Rack and Rails.
+        # A call to #empty? forces the session to be loaded.
+        session.empty?
+
        session.keys.grep(/^devise\./).each { |k| session.delete(k) }
      end

--- a/lib/devise/failure_app.rb
+++ b/lib/devise/failure_app.rb
@@ -77,9 +77,9 @@ module Devise

      flash.now[:alert] = i18n_message(:invalid) if is_flashing_format?
      self.response = recall_app(warden_options[:recall]).call(request.env).tap { |response|
-        status = response[0].in?(300..399) ? Devise.responder.redirect_status : Devise.responder.error_status
-        # Avoid warnings translating status to code using Rails if available (e.g. `unprocessable_entity` => `unprocessable_content`)
-        response[0] = ActionDispatch::Response.try(:rack_status_code, status) || Rack::Utils.status_code(status)
+        response[0] = Rack::Utils.status_code(
+          response[0].in?(300..399) ? Devise.responder.redirect_status : Devise.responder.error_status
+        )
      }
    end

@@ -111,16 +111,11 @@ module Devise
        options[:scope] = "devise.failure"
        options[:default] = [message]
        auth_keys = scope_class.authentication_keys
-        human_keys = (auth_keys.respond_to?(:keys) ? auth_keys.keys : auth_keys).map { |key|
-          scope_class.human_attribute_name(key).downcase
-        }
-        options[:authentication_keys] = human_keys.join(I18n.t(:"support.array.words_connector"))
+        keys = (auth_keys.respond_to?(:keys) ? auth_keys.keys : auth_keys).map { |key| scope_class.human_attribute_name(key) }
+        options[:authentication_keys] = keys.join(I18n.t(:"support.array.words_connector"))
        options = i18n_options(options)

-        I18n.t(:"#{scope}.#{message}", **options).then { |msg|
-          # Ensure that auth keys at the start of the translated string are properly cased.
-          msg.start_with?(human_keys.first) ? msg.upcase_first : msg
-        }
+        I18n.t(:"#{scope}.#{message}", **options)
      else
        message.to_s
      end
@@ -154,7 +149,7 @@ module Devise
      opts  = {}

      # Initialize script_name with nil to prevent infinite loops in
-      # authenticated mounted engines
+      # authenticated mounted engines in rails 4.2 and 5.0
      opts[:script_name] = nil

      route = route(scope)
@@ -166,6 +161,13 @@ module Devise

      if relative_url_root?
        opts[:script_name] = relative_url_root
+
+      # We need to add the rootpath to `script_name` manually for applications that use a Rails
+      # version lower than 5.1. Otherwise, it is going to generate a wrong path for Engines
+      # that use Devise. Remove it when the support of Rails 5.0 is dropped.
+      elsif root_path_defined?(context) && !rails_51_and_up?
+        rootpath = context.routes.url_helpers.root_path
+        opts[:script_name] = rootpath.chomp('/') if rootpath.length > 1
      end

      if context.respond_to?(route)
@@ -281,5 +283,15 @@ module Devise
    end

    ActiveSupport.run_load_hooks(:devise_failure_app, self)
+
+    private
+
+    def root_path_defined?(context)
+      defined?(context.routes) && context.routes.url_helpers.respond_to?(:root_path)
+    end
+
+    def rails_51_and_up?
+      Rails.gem_version >= Gem::Version.new("5.1")
+    end
  end
 end
--- a/lib/devise/hooks/activatable.rb
+++ b/lib/devise/hooks/activatable.rb
@@ -7,6 +7,6 @@ Warden::Manager.after_set_user do |record, warden, options|
  if record && record.respond_to?(:active_for_authentication?) && !record.active_for_authentication?
    scope = options[:scope]
    warden.logout(scope)
-    throw :warden, scope: scope, message: record.inactive_message, locale: options.fetch(:locale, I18n.locale)
+    throw :warden, scope: scope, message: record.inactive_message
  end
 end
--- a/lib/devise/hooks/timeoutable.rb
+++ b/lib/devise/hooks/timeoutable.rb
@@ -25,7 +25,7 @@ Warden::Manager.after_set_user do |record, warden, options|
        record.timedout?(last_request_at) &&
        !proxy.remember_me_is_active?(record)
      Devise.sign_out_all_scopes ? proxy.sign_out : proxy.sign_out(scope)
-      throw :warden, scope: scope, message: :timeout, locale: options.fetch(:locale, I18n.locale)
+      throw :warden, scope: scope, message: :timeout
    end

    unless env['devise.skip_trackable']
--- a/lib/devise/mailers/helpers.rb
+++ b/lib/devise/mailers/helpers.rb
@@ -33,22 +33,28 @@ module Devise
          subject: subject_for(action),
          to: resource.email,
          from: mailer_sender(devise_mapping),
-          reply_to: mailer_sender(devise_mapping),
+          reply_to: mailer_reply_to(devise_mapping),
          template_path: template_paths,
          template_name: action
-        }
-        # Give priority to the mailer's default if they exists.
-        headers.delete(:from) if default_params[:from]
-        headers.delete(:reply_to) if default_params[:reply_to]
-
-        headers.merge!(opts)
+        }.merge(opts)

        @email = headers[:to]
        headers
      end

-      def mailer_sender(mapping)
-        if Devise.mailer_sender.is_a?(Proc)
+      def mailer_reply_to(mapping)
+        mailer_sender(mapping, :reply_to)
+      end
+
+      def mailer_from(mapping)
+        mailer_sender(mapping, :from)
+      end
+
+      def mailer_sender(mapping, sender = :from)
+        default_sender = default_params[sender]
+        if default_sender.present?
+          default_sender.respond_to?(:to_proc) ? instance_eval(&default_sender) : default_sender
+        elsif Devise.mailer_sender.is_a?(Proc)
          Devise.mailer_sender.call(mapping.name)
        else
          Devise.mailer_sender
--- a/lib/devise/mapping.rb
+++ b/lib/devise/mapping.rb
@@ -30,7 +30,7 @@ module Devise

    alias :name :singular

-    # Receives an object and finds a scope for it. If a scope cannot be found,
+    # Receives an object and find a scope for it. If a scope cannot be found,
    # raises an error. If a symbol is given, it's considered to be the scope.
    def self.find_scope!(obj)
      obj = obj.devise_scope if obj.respond_to?(:devise_scope)
--- a/lib/devise/models/authenticatable.rb
+++ b/lib/devise/models/authenticatable.rb
@@ -2,6 +2,7 @@

 require 'devise/hooks/activatable'
 require 'devise/hooks/csrf_cleaner'
+require 'devise/rails/deprecated_constant_accessor'

 module Devise
  module Models
@@ -60,6 +61,9 @@ module Devise
        :last_sign_in_ip, :password_salt, :confirmation_token, :confirmed_at, :confirmation_sent_at,
        :remember_token, :unconfirmed_email, :failed_attempts, :unlock_token, :locked_at]

+      include Devise::DeprecatedConstantAccessor
+      deprecate_constant "BLACKLIST_FOR_SERIALIZATION", "Devise::Models::Authenticatable::UNSAFE_ATTRIBUTES_FOR_SERIALIZATION", deprecator: Devise.deprecator
+
      included do
        class_attribute :devise_modules, instance_writer: false
        self.devise_modules ||= []
@@ -183,8 +187,11 @@ module Devise
      #         # Deliver later with Active Job's `deliver_later`
      #         if message.respond_to?(:deliver_later)
      #           message.deliver_later
-      #         else
+      #         # Remove once we move to Rails 4.2+ only, as `deliver` is deprecated.
+      #         elsif message.respond_to?(:deliver_now)
      #           message.deliver_now
+      #         else
+      #           message.deliver
      #         end
      #       end
      #
@@ -192,7 +199,12 @@ module Devise
      #
      def send_devise_notification(notification, *args)
        message = devise_mailer.send(notification, self, *args)
-        message.deliver_now
+        # Remove once we move to Rails 4.2+ only.
+        if message.respond_to?(:deliver_now)
+          message.deliver_now
+        else
+          message.deliver
+        end
      end

      def downcase_keys
--- a/lib/devise/models/database_authenticatable.rb
+++ b/lib/devise/models/database_authenticatable.rb
@@ -84,7 +84,16 @@ module Devise
      # users to change relevant information like the e-mail without changing
      # their password). In case the password field is rejected, the confirmation
      # is also rejected as long as it is also blank.
-      def update_with_password(params)
+      def update_with_password(params, *options)
+        if options.present?
+          Devise.deprecator.warn <<-DEPRECATION.strip_heredoc
+            [Devise] The second argument of `DatabaseAuthenticatable#update_with_password`
+            (`options`) is deprecated and it will be removed in the next major version.
+            It was added to support a feature deprecated in Rails 4, so you can safely remove it
+            from your code.
+          DEPRECATION
+        end
+
        current_password = params.delete(:current_password)

        if params[:password].blank?
@@ -93,9 +102,9 @@ module Devise
        end

        result = if valid_password?(current_password)
-          update(params)
+          update(params, *options)
        else
-          assign_attributes(params)
+          assign_attributes(params, *options)
          valid?
          errors.add(:current_password, current_password.blank? ? :blank : :invalid)
          false
@@ -112,16 +121,25 @@ module Devise
      #
      # Example:
      #
-      #   def update_without_password(params)
+      #   def update_without_password(params, *options)
      #     params.delete(:email)
      #     super(params)
      #   end
      #
-      def update_without_password(params)
+      def update_without_password(params, *options)
+        if options.present?
+          Devise.deprecator.warn <<-DEPRECATION.strip_heredoc
+            [Devise] The second argument of `DatabaseAuthenticatable#update_without_password`
+            (`options`) is deprecated and it will be removed in the next major version.
+            It was added to support a feature deprecated in Rails 4, so you can safely remove it
+            from your code.
+          DEPRECATION
+        end
+
        params.delete(:password)
        params.delete(:password_confirmation)

-        result = update(params)
+        result = update(params, *options)
        clean_up_passwords
        result
      end
--- a/lib/devise/models/lockable.rb
+++ b/lib/devise/models/lockable.rb
@@ -84,7 +84,7 @@ module Devise
        if_access_locked { send_unlock_instructions }
      end

-      # Overwrites active_for_authentication? from Devise::Models::Authenticatable for locking purposes
+      # Overwrites active_for_authentication? from Devise::Models::Activatable for locking purposes
      # by verifying whether a user is active to sign in or not based on locked?
      def active_for_authentication?
        super && !access_locked?
--- a/lib/devise/models/validatable.rb
+++ b/lib/devise/models/validatable.rb
@@ -14,8 +14,6 @@ module Devise
    #   * +email_regexp+: the regular expression used to validate e-mails;
    #   * +password_length+: a range expressing password length. Defaults to 6..128.
    #
-    # Since +password_length+ is applied in a proc within `validates_length_of` it can be overridden
-    # at runtime.
    module Validatable
      # All validations used by this module.
      VALIDATIONS = [:validates_presence_of, :validates_uniqueness_of, :validates_format_of,
@@ -36,7 +34,7 @@ module Devise

          validates_presence_of     :password, if: :password_required?
          validates_confirmation_of :password, if: :password_required?
-          validates_length_of       :password, minimum: proc { password_length.min }, maximum: proc { password_length.max }, allow_blank: true
+          validates_length_of       :password, within: password_length, allow_blank: true
        end
      end

--- a/lib/devise/orm.rb
+++ b/lib/devise/orm.rb
@@ -1,20 +1,22 @@
-# frozen_string_literal: true
-
 module Devise
  module Orm # :nodoc:
    def self.active_record?(model)
      defined?(ActiveRecord) && model < ActiveRecord::Base
    end

+    def self.active_record_51?(model)
+      active_record?(model) && ActiveRecord.gem_version >= Gem::Version.new("5.1.x")
+    end
+
    def self.included(model)
-      if Devise::Orm.active_record?(model)
-        model.include DirtyTrackingActiveRecordMethods
+      if Devise::Orm.active_record_51?(model)
+        model.include DirtyTrackingNewMethods
      else
-        model.include DirtyTrackingMongoidMethods
+        model.include DirtyTrackingOldMethods
      end
    end

-    module DirtyTrackingActiveRecordMethods
+    module DirtyTrackingNewMethods
      def devise_email_before_last_save
        email_before_last_save
      end
@@ -40,9 +42,9 @@ module Devise
      end
    end

-    module DirtyTrackingMongoidMethods
+    module DirtyTrackingOldMethods
      def devise_email_before_last_save
-        respond_to?(:email_previously_was) ? email_previously_was : email_was
+        email_was
      end

      def devise_email_in_database
@@ -50,11 +52,11 @@ module Devise
      end

      def devise_saved_change_to_email?
-        respond_to?(:email_previously_changed?) ? email_previously_changed? : email_changed?
+        email_changed?
      end

      def devise_saved_change_to_encrypted_password?
-        respond_to?(:encrypted_password_previously_changed?) ? encrypted_password_previously_changed? : encrypted_password_changed?
+        encrypted_password_changed?
      end

      def devise_will_save_change_to_email?
--- a/lib/devise/parameter_sanitizer.rb
+++ b/lib/devise/parameter_sanitizer.rb
@@ -130,7 +130,8 @@ module Devise
    #
    # Returns an +ActiveSupport::HashWithIndifferentAccess+.
    def cast_to_hash(params)
-      params && params.to_h
+      # TODO: Remove the `with_indifferent_access` method call when we only support Rails 5+.
+      params && params.to_h.with_indifferent_access
    end

    def default_params
--- a/lib/devise/rails.rb
+++ b/lib/devise/rails.rb
@@ -38,7 +38,7 @@ module Devise
    end

    initializer "devise.secret_key" do |app|
-      Devise.secret_key ||= app.secret_key_base
+      Devise.secret_key ||= Devise::SecretKeyFinder.new(app).find

      Devise.token_generator ||=
        if secret_key = Devise.secret_key
@@ -47,11 +47,5 @@ module Devise
          )
        end
    end
-
-    initializer "devise.configure_zeitwerk" do
-      if Rails.autoloaders.zeitwerk_enabled? && !defined?(ActionMailer)
-        Rails.autoloaders.main.ignore("#{root}/app/mailers/devise/mailer.rb")
-      end
-    end
  end
 end
--- a/lib/devise/rails/deprecated_constant_accessor.rb
+++ b/lib/devise/rails/deprecated_constant_accessor.rb
@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+begin
+  require 'active_support/deprecation/constant_accessor'
+
+  module Devise
+    DeprecatedConstantAccessor = ActiveSupport::Deprecation::DeprecatedConstantAccessor #:nodoc:
+  end
+rescue LoadError
+
+  # Copy of constant deprecation module from Rails / Active Support version 6, so we can use it
+  # with Rails <= 5.0 versions. This can be removed once we support only Rails 5.1 or greater.
+  module Devise
+    module DeprecatedConstantAccessor #:nodoc:
+      def self.included(base)
+        require "active_support/inflector/methods"
+
+        extension = Module.new do
+          def const_missing(missing_const_name)
+            if class_variable_defined?(:@@_deprecated_constants)
+              if (replacement = class_variable_get(:@@_deprecated_constants)[missing_const_name.to_s])
+                replacement[:deprecator].warn(replacement[:message] || "#{name}::#{missing_const_name} is deprecated! Use #{replacement[:new]} instead.", Rails::VERSION::MAJOR == 4 ? caller : caller_locations)
+                return ActiveSupport::Inflector.constantize(replacement[:new].to_s)
+              end
+            end
+            super
+          end
+
+          def deprecate_constant(const_name, new_constant, message: nil, deprecator: Devise.deprecator)
+            class_variable_set(:@@_deprecated_constants, {}) unless class_variable_defined?(:@@_deprecated_constants)
+            class_variable_get(:@@_deprecated_constants)[const_name.to_s] = { new: new_constant, message: message, deprecator: deprecator }
+          end
+        end
+        base.singleton_class.prepend extension
+      end
+    end
+  end
+
+end
--- a/lib/devise/rails/routes.rb
+++ b/lib/devise/rails/routes.rb
@@ -235,6 +235,7 @@ module ActionDispatch::Routing
      options[:constraints]   = (@scope[:constraints] || {}).merge(options[:constraints] || {})
      options[:defaults]      = (@scope[:defaults] || {}).merge(options[:defaults] || {})
      options[:options]       = @scope[:options] || {}
+      options[:options][:format] = false if options[:format] == false

      resources.map!(&:to_sym)

@@ -412,7 +413,7 @@ module ActionDispatch::Routing
          controller: controllers[:registrations]
        }

-        resource :registration, **options do
+        resource :registration, options do
          get :cancel
        end
      end
@@ -446,7 +447,7 @@ ERROR
          match "#{path_prefix}/#{provider}",
            to: "#{controllers[:omniauth_callbacks]}#passthru",
            as: "#{provider}_omniauth_authorize",
-            via: OmniAuth.config.allowed_request_methods
+            via: [:get, :post]

          match "#{path_prefix}/#{provider}/callback",
            to: "#{controllers[:omniauth_callbacks]}##{provider}",
@@ -461,7 +462,7 @@ ERROR
        current_scope = @scope.dup

        exclusive = { as: new_as, path: new_path, module: nil }
-        exclusive.merge!(options.slice(:constraints, :format, :defaults, :options))
+        exclusive.merge!(options.slice(:constraints, :defaults, :options))

        if @scope.respond_to? :new
          @scope = @scope.new exclusive
--- a/lib/devise/secret_key_finder.rb
+++ b/lib/devise/secret_key_finder.rb
@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module Devise
+  class SecretKeyFinder
+    def initialize(application)
+      @application = application
+    end
+
+    def find
+      if @application.respond_to?(:credentials) && key_exists?(@application.credentials)
+        @application.credentials.secret_key_base
+      elsif @application.respond_to?(:secrets) && key_exists?(@application.secrets)
+        @application.secrets.secret_key_base
+      elsif @application.config.respond_to?(:secret_key_base) && key_exists?(@application.config)
+        @application.config.secret_key_base
+      elsif @application.respond_to?(:secret_key_base) && key_exists?(@application)
+        @application.secret_key_base
+      end
+    end
+
+    private
+
+    def key_exists?(object)
+      object.secret_key_base.present?
+    end
+  end
+end
--- a/lib/devise/test/controller_helpers.rb
+++ b/lib/devise/test/controller_helpers.rb
@@ -64,7 +64,17 @@ module Devise
      #
      # sign_in users(:alice)
      # sign_in users(:alice), scope: :admin
-      def sign_in(resource, scope: nil)
+      def sign_in(resource, deprecated = nil, scope: nil)
+        if deprecated.present?
+          scope = resource
+          resource = deprecated
+
+          Devise.deprecator.warn <<-DEPRECATION.strip_heredoc
+            [Devise] sign_in(:#{scope}, resource) on controller tests is deprecated and will be removed from Devise.
+            Please use sign_in(resource, scope: :#{scope}) instead.
+          DEPRECATION
+        end
+
        scope ||= Devise::Mapping.find_scope!(resource)

        warden.instance_variable_get(:@users).delete(scope)
@@ -131,6 +141,7 @@ module Devise

          status, headers, response = Devise.warden_config[:failure_app].call(env).to_a
          @controller.response.headers.merge!(headers)
+          @controller.response.content_type = headers["Content-Type"] unless Rails::VERSION::MAJOR >= 5
          @controller.status = status
          @controller.response_body = response.body
          nil # causes process return @response
--- a/lib/devise/test_helpers.rb
+++ b/lib/devise/test_helpers.rb
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Devise
+  module TestHelpers
+    def self.included(base)
+      base.class_eval do
+        Devise.deprecator.warn <<-DEPRECATION.strip_heredoc
+          [Devise] including `Devise::TestHelpers` is deprecated and will be removed from Devise.
+          For controller tests, please include `Devise::Test::ControllerHelpers` instead.
+        DEPRECATION
+        include Devise::Test::ControllerHelpers
+      end
+    end
+  end
+end
--- a/lib/devise/version.rb
+++ b/lib/devise/version.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: true

 module Devise
-  VERSION = "5.0.0.rc".freeze
+  VERSION = "4.9.4".freeze
 end
--- a/lib/generators/active_record/devise_generator.rb
+++ b/lib/generators/active_record/devise_generator.rb
@@ -5,7 +5,7 @@ require 'generators/devise/orm_helpers'

 module ActiveRecord
  module Generators
-    class DeviseGenerator < Base
+    class DeviseGenerator < ActiveRecord::Generators::Base
      argument :attributes, type: :array, default: [], banner: "field:type field:type"

      class_option :primary_key_type, type: :string, desc: "The type for primary key"
@@ -82,6 +82,10 @@ RUBY
        postgresql?
      end

+      def rails5_and_up?
+        Rails::VERSION::MAJOR >= 5
+      end
+
      def rails61_and_up?
        Rails::VERSION::MAJOR > 6 || (Rails::VERSION::MAJOR == 6 && Rails::VERSION::MINOR >= 1)
      end
@@ -102,12 +106,14 @@ RUBY
        end
      end

-      def migration_version
-        "[#{Rails::VERSION::MAJOR}.#{Rails::VERSION::MINOR}]"
-      end
+     def migration_version
+       if rails5_and_up?
+         "[#{Rails::VERSION::MAJOR}.#{Rails::VERSION::MINOR}]"
+       end
+     end

     def primary_key_type
-       primary_key_string
+       primary_key_string if rails5_and_up?
     end

     def primary_key_string
--- a/lib/generators/devise/controllers_generator.rb
+++ b/lib/generators/devise/controllers_generator.rb
@@ -11,7 +11,7 @@ module Devise
        Create inherited Devise controllers in your app/controllers folder.

        Use -c to specify which controller you want to overwrite.
-        If you do not specify a controller, all controllers will be created.
+        If you do no specify a controller, all controllers will be created.
        For example:

          rails generate devise:controllers users -c=sessions
--- a/lib/generators/templates/devise.rb
+++ b/lib/generators/templates/devise.rb
@@ -157,9 +157,6 @@ Devise.setup do |config|
  # initial account confirmation) to be applied. Requires additional unconfirmed_email
  # db field (see migrations). Until confirmed, new email is stored in
  # unconfirmed_email column, and copied to email column on successful confirmation.
-  # Also, when used in conjunction with `send_email_changed_notification`,
-  # the notification is sent to the original email when the change is requested,
-  # not when the unconfirmed email is confirmed.
  config.reconfirmable = true

  # Defines which key will be used when confirming an account
@@ -280,9 +277,9 @@ Devise.setup do |config|
  # If you want to use other strategies, that are not supported by Devise, or
  # change the failure app, you can configure them inside the config.warden block.
  #
-  # config.warden do |warden_config|
-  #   warden_config.intercept_401 = false
-  #   warden_config.default_strategies(scope: :user).unshift :some_external_strategy
+  # config.warden do |manager|
+  #   manager.intercept_401 = false
+  #   manager.default_strategies(scope: :user).unshift :some_external_strategy
  # end

  # ==> Mountable engine configurations
@@ -305,7 +302,7 @@ Devise.setup do |config|
  # apps is `200 OK` and `302 Found` respectively, but new apps are generated with
  # these new defaults that match Hotwire/Turbo behavior.
  # Note: These might become the new default in future versions of Devise.
-  config.responder.error_status = <%= Rack::Utils::SYMBOL_TO_STATUS_CODE.key(422).inspect %>
+  config.responder.error_status = :unprocessable_entity
  config.responder.redirect_status = :see_other

  # ==> Configuration for :registerable
--- a/test/controllers/custom_strategy_test.rb
+++ b/test/controllers/custom_strategy_test.rb
@@ -3,7 +3,7 @@
 require 'test_helper'
 require 'ostruct'
 require 'warden/strategies/base'
-require 'devise/test/controller_helpers'
+require 'devise/test_helpers'

 class CustomStrategyController < ActionController::Base
  def new
--- a/test/controllers/sessions_controller_test.rb
+++ b/test/controllers/sessions_controller_test.rb
@@ -74,7 +74,7 @@ class SessionsControllerTest < Devise::ControllerTestCase
    assert_template "devise/sessions/new"
  end

-  test "#destroy doesn't set the flash and returns 204 status if the requested format is not navigational" do
+  test "#destroy doesn't set the flash if the requested format is not navigational" do
    request.env["devise.mapping"] = Devise.mappings[:user]
    user = create_user
    user.confirm
@@ -88,15 +88,21 @@ class SessionsControllerTest < Devise::ControllerTestCase
    assert_equal 204, @response.status
  end

-  test "#destroy returns 401 status if user is not signed in and the requested format is not navigational" do
-    request.env["devise.mapping"] = Devise.mappings[:user]
-    delete :destroy, format: 'json'
-    assert_equal 401, @response.status
-  end
+  if defined?(ActiveRecord) && ActiveRecord::Base.respond_to?(:mass_assignment_sanitizer)
+    test "#new doesn't raise mass-assignment exception even if sign-in key is attr_protected" do
+      request.env["devise.mapping"] = Devise.mappings[:user]

-  test "#destroy returns 302 status if user is not signed in and the requested format is navigational" do
-    request.env["devise.mapping"] = Devise.mappings[:user]
-    delete :destroy
-    assert_equal 302, @response.status
+      ActiveRecord::Base.mass_assignment_sanitizer = :strict
+      User.class_eval { attr_protected :email }
+
+      begin
+        assert_nothing_raised do
+          get :new, user: { email: "allez viens!" }
+        end
+      ensure
+        ActiveRecord::Base.mass_assignment_sanitizer = :logger
+        User.class_eval { attr_accessible :email }
+      end
+    end
  end
 end
--- a/test/devise_test.rb
+++ b/test/devise_test.rb
@@ -86,20 +86,15 @@ class DeviseTest < ActiveSupport::TestCase
    Devise::CONTROLLERS.delete(:kivi)
  end

-  test 'Devise.secure_compare fails when comparing different strings or nil' do
+  test 'should complain when comparing empty or different sized passes' do
    [nil, ""].each do |empty|
      assert_not Devise.secure_compare(empty, "something")
      assert_not Devise.secure_compare("something", empty)
+      assert_not Devise.secure_compare(empty, empty)
    end
-    assert_not Devise.secure_compare(nil, nil)
    assert_not Devise.secure_compare("size_1", "size_four")
  end

-  test 'Devise.secure_compare passes when strings are the same, even two empty strings' do
-    assert Devise.secure_compare("", "")
-    assert Devise.secure_compare("something", "something")
-  end
-
  test 'Devise.email_regexp should match valid email addresses' do
    valid_emails = ["test@example.com", "jo@jo.co", "f4$_m@you.com", "testing.example@example.com.ua", "test@tt", "test@valid---domain.com"]
    non_valid_emails = ["rex", "test user@example.com", "test_user@example server.com"]
@@ -111,4 +106,10 @@ class DeviseTest < ActiveSupport::TestCase
      assert_no_match Devise.email_regexp, email
    end
  end
+
+  test 'Devise.activerecord51? deprecation' do
+    assert_deprecated("`Devise.activerecord51?` is deprecated", Devise.deprecator) do
+      Devise.activerecord51?
+    end
+  end
 end
--- a/test/failure_app_test.rb
+++ b/test/failure_app_test.rb
@@ -184,27 +184,17 @@ class FailureTest < ActiveSupport::TestCase

    test 'uses the proxy failure message as symbol' do
      call_failure('warden' => OpenStruct.new(message: :invalid))
-      assert_equal 'Invalid email or password.', @request.flash[:alert]
+      assert_equal 'Invalid Email or password.', @request.flash[:alert]
      assert_equal 'http://test.host/users/sign_in', @response.second["Location"]
    end

    test 'supports authentication_keys as a Hash for the flash message' do
      swap Devise, authentication_keys: { email: true, login: true } do
        call_failure('warden' => OpenStruct.new(message: :invalid))
-        assert_equal 'Invalid email, login or password.', @request.flash[:alert]
+        assert_equal 'Invalid Email, Login or password.', @request.flash[:alert]
      end
    end

-    test 'downcases authentication_keys for the flash message' do
-      call_failure('warden' => OpenStruct.new(message: :invalid))
-      assert_equal 'Invalid email or password.', @request.flash[:alert]
-    end
-
-    test 'humanizes the flash message' do
-      call_failure('warden' => OpenStruct.new(message: :invalid))
-      assert_equal @request.flash[:alert], @request.flash[:alert].humanize
-    end
-
    test 'uses custom i18n options' do
      call_failure('warden' => OpenStruct.new(message: :does_not_exist), app: FailureWithI18nOptions)
      assert_equal 'User Steve does not exist', @request.flash[:alert]
@@ -298,7 +288,7 @@ class FailureTest < ActiveSupport::TestCase

    test 'uses the failure message as response body' do
      call_failure('formats' => Mime[:xml], 'warden' => OpenStruct.new(message: :invalid))
-      assert_match '<error>Invalid email or password.</error>', @response.third.body
+      assert_match '<error>Invalid Email or password.</error>', @response.third.body
    end

    test 'respects the i18n locale passed via warden options when responding to HTTP request' do
@@ -353,7 +343,7 @@ class FailureTest < ActiveSupport::TestCase
      }
      call_failure(env)
      assert_includes @response.third.body, '<h2>Log in</h2>'
-      assert_includes @response.third.body, 'Invalid email or password.'
+      assert_includes @response.third.body, 'Invalid Email or password.'
    end

    test 'calls the original controller if not confirmed email' do
@@ -388,7 +378,7 @@ class FailureTest < ActiveSupport::TestCase
          }
          call_failure(env)
          assert_includes @response.third.body, '<h2>Log in</h2>'
-          assert_includes @response.third.body, 'Invalid email or password.'
+          assert_includes @response.third.body, 'Invalid Email or password.'
          assert_equal '/sample', @request.env["SCRIPT_NAME"]
          assert_equal '/users/sign_in', @request.env["PATH_INFO"]
        end
@@ -419,7 +409,7 @@ class FailureTest < ActiveSupport::TestCase
          call_failure(env)

          assert_equal 422, @response.first
-          assert_includes @response.third.body, 'Invalid email or password.'
+          assert_includes @response.third.body, 'Invalid Email or password.'
        end
      end

@@ -445,7 +435,7 @@ class FailureTest < ActiveSupport::TestCase
        call_failure(env)

        assert_equal 200, @response.first
-        assert_includes @response.third.body, 'Invalid email or password.'
+        assert_includes @response.third.body, 'Invalid Email or password.'
      end

      test 'users default hardcoded responder `redirect_status` for the status code since responders version does not support configuring it' do
--- a/test/generators/active_record_generator_test.rb
+++ b/test/generators/active_record_generator_test.rb
@@ -20,7 +20,11 @@ if DEVISE_ORM == :active_record
      Rails.application.config.paths.add "db/migrate", with: "db2/migrate"

      run_generator %w(monster)
-      assert_migration "db2/migrate/devise_create_monsters.rb", /def change/
+      if Rails.version >= '5.0.3'
+        assert_migration "db2/migrate/devise_create_monsters.rb", /def change/
+      else
+        assert_migration "db/migrate/devise_create_monsters.rb", /def change/
+      end

      Rails.application.config.paths["db/migrate"] = old_paths
    end
@@ -45,7 +49,11 @@ if DEVISE_ORM == :active_record
      assert_file "app/models/monster.rb"
      run_generator %w(monster)

-      assert_migration "db2/migrate/add_devise_to_monsters.rb"
+      if Rails.version >= '5.0.3'
+        assert_migration "db2/migrate/add_devise_to_monsters.rb"
+      else
+        assert_migration "db/migrate/add_devise_to_monsters.rb"
+      end

      Rails.application.config.paths["db/migrate"] = old_paths
    end
@@ -76,7 +84,11 @@ if DEVISE_ORM == :active_record

    test "add primary key type with rails 5 when specified in rails generator" do
      run_generator ["monster", "--primary_key_type=uuid"]
-      assert_migration "db/migrate/devise_create_monsters.rb", /create_table :monsters, id: :uuid do/
+      if Devise::Test.rails5_and_up?
+        assert_migration "db/migrate/devise_create_monsters.rb", /create_table :monsters, id: :uuid do/
+      else
+        assert_migration "db/migrate/devise_create_monsters.rb", /create_table :monsters do/
+      end
    end
  end

--- a/test/generators/devise_generator_test.rb
+++ b/test/generators/devise_generator_test.rb
@@ -37,4 +37,5 @@ class DeviseGeneratorTest < Rails::Generators::TestCase
    FileUtils.mkdir_p(destination)
    FileUtils.cp routes, destination
  end
+
 end
--- a/test/generators/install_generator_test.rb
+++ b/test/generators/install_generator_test.rb
@@ -23,12 +23,4 @@ class InstallGeneratorTest < Rails::Generators::TestCase
    assert_no_file "config/initializers/devise.rb"
    assert_no_file "config/locales/devise.en.yml"
  end
-
-  test "responder error_status based on rack version" do
-    run_generator(["--orm=active_record"])
-
-    error_status = Rack::RELEASE >= "3.1" ? :unprocessable_content : :unprocessable_entity
-
-    assert_file "config/initializers/devise.rb", /config\.responder\.error_status = #{error_status.inspect}/
-  end
 end
--- a/test/helpers/devise_helper_test.rb
+++ b/test/helpers/devise_helper_test.rb
@@ -34,6 +34,10 @@ class DeviseHelperTest < Devise::IntegrationTest
  end

  test 'test errors.messages.not_saved with multiple errors from i18n' do
+    # Dirty tracking behavior prevents email validations from being applied:
+    #    https://github.com/mongoid/mongoid/issues/756
+    (pending "Fails on Mongoid < 2.1"; break) if defined?(Mongoid) && Mongoid::VERSION.to_f < 2.1
+
    get new_user_registration_path

    fill_in 'email', with: 'invalid_email'
--- a/test/integration/authenticatable_test.rb
+++ b/test/integration/authenticatable_test.rb
@@ -563,7 +563,7 @@ class AuthenticationKeysTest < Devise::IntegrationTest
  test 'missing authentication keys cause authentication to abort' do
    swap Devise, authentication_keys: [:subdomain] do
      sign_in_as_user
-      assert_contain "Invalid subdomain or password."
+      assert_contain "Invalid Subdomain or password."
      assert_not warden.authenticated?(:user)
    end
  end
@@ -602,7 +602,7 @@ class AuthenticationRequestKeysTest < Devise::IntegrationTest

    swap Devise, request_keys: [:subdomain] do
      sign_in_as_user
-      assert_contain "Invalid email or password."
+      assert_contain "Invalid Email or password."
      assert_not warden.authenticated?(:user)
    end
  end
--- a/test/integration/confirmable_test.rb
+++ b/test/integration/confirmable_test.rb
@@ -136,22 +136,13 @@ class ConfirmationTest < Devise::IntegrationTest
    end
  end

-  test 'not confirmed user redirect respects i18n locale set' do
-    swap Devise, allow_unconfirmed_access_for: 0.days do
-      sign_in_as_user(confirm: false, visit: new_user_session_path(locale: "pt-BR"))
-
-      assert_contain 'Você precisa confirmar seu email para continuar'
-      assert_not warden.authenticated?(:user)
-    end
-  end
-
  test 'not confirmed user should not see confirmation message if invalid credentials are given' do
    swap Devise, allow_unconfirmed_access_for: 0.days do
      sign_in_as_user(confirm: false) do
        fill_in 'password', with: 'invalid'
      end

-      assert_contain 'Invalid email or password'
+      assert_contain 'Invalid Email or password'
      assert_not warden.authenticated?(:user)
    end
  end
--- a/test/integration/database_authenticatable_test.rb
+++ b/test/integration/database_authenticatable_test.rb
@@ -70,7 +70,7 @@ class DatabaseAuthenticationTest < Devise::IntegrationTest
      fill_in 'password', with: 'abcdef'
    end

-    assert_contain 'Invalid email or password'
+    assert_contain 'Invalid Email or password'
    assert_not warden.authenticated?(:admin)
  end

@@ -82,7 +82,7 @@ class DatabaseAuthenticationTest < Devise::IntegrationTest
        end

        assert_not_contain 'Not found in database'
-        assert_contain 'Invalid email or password.'
+        assert_contain 'Invalid Email or password.'
      end
    end
  end
--- a/test/integration/http_authenticatable_test.rb
+++ b/test/integration/http_authenticatable_test.rb
@@ -52,7 +52,7 @@ class HttpAuthenticationTest < Devise::IntegrationTest
    sign_in_as_new_user_with_http("unknown")
    assert_equal 401, status
    assert_equal "application/json; charset=utf-8", headers["Content-Type"]
-    assert_match '"error":"Invalid email or password."', response.body
+    assert_match '"error":"Invalid Email or password."', response.body
  end

  test 'returns a custom response with www-authenticate and chosen realm' do
--- a/test/integration/omniauthable_test.rb
+++ b/test/integration/omniauthable_test.rb
@@ -126,28 +126,6 @@ class OmniauthableIntegrationTest < Devise::IntegrationTest
    end
  end

-  test "authorization path via GET when Omniauth allowed_request_methods includes GET" do
-    original_allowed = OmniAuth.config.allowed_request_methods
-    OmniAuth.config.allowed_request_methods = [:get, :post]
-
-    get "/users/auth/facebook"
-
-    assert_response(:redirect)
-  ensure
-    OmniAuth.config.allowed_request_methods = original_allowed
-  end
-
-  test "authorization path via GET when Omniauth allowed_request_methods doesn't include GET" do
-    original_allowed = OmniAuth.config.allowed_request_methods
-    OmniAuth.config.allowed_request_methods = [:post]
-
-    assert_raises(ActionController::RoutingError) do
-      get "/users/auth/facebook"
-    end
-  ensure
-    OmniAuth.config.allowed_request_methods = original_allowed
-  end
-
  test "generates a link to authenticate with provider" do
    visit "/users/sign_in"
    assert_select "form[action=?][method=post]", "/users/auth/facebook" do
--- a/test/integration/recoverable_test.rb
+++ b/test/integration/recoverable_test.rb
@@ -18,7 +18,7 @@ class PasswordTest < Devise::IntegrationTest
    yield if block_given?

    Devise.stubs(:friendly_token).returns("abcdef")
-    click_button 'Send me password reset instructions'
+    click_button 'Send me reset password instructions'
  end

  def reset_password(options = {}, &block)
@@ -339,7 +339,7 @@ class PasswordTest < Devise::IntegrationTest
    swap Devise, paranoid: true do
      visit_new_password_path
      fill_in "email", with: "arandomemail@test.com"
-      click_button 'Send me password reset instructions'
+      click_button 'Send me reset password instructions'

      assert_not_contain "1 error prohibited this user from being saved:"
      assert_not_contain "Email not found"
@@ -353,7 +353,7 @@ class PasswordTest < Devise::IntegrationTest
      user = create_user
      visit_new_password_path
      fill_in 'email', with: user.email
-      click_button 'Send me password reset instructions'
+      click_button 'Send me reset password instructions'

      assert_contain "If your email address exists in our database, you will receive a password recovery link at your email address in a few minutes."
      assert_current_url "/users/sign_in"
--- a/test/integration/registerable_test.rb
+++ b/test/integration/registerable_test.rb
@@ -98,6 +98,10 @@ class RegistrationTest < Devise::IntegrationTest
  end

  test 'a guest user cannot sign up with invalid information' do
+    # Dirty tracking behavior prevents email validations from being applied:
+    #    https://github.com/mongoid/mongoid/issues/756
+    (pending "Fails on Mongoid < 2.1"; break) if defined?(Mongoid) && Mongoid::VERSION.to_f < 2.1
+
    get new_user_registration_path

    fill_in 'email', with: 'invalid_email'
@@ -116,6 +120,10 @@ class RegistrationTest < Devise::IntegrationTest
  end

  test 'a guest should not sign up with email/password that already exists' do
+    # Dirty tracking behavior prevents email validations from being applied:
+    #    https://github.com/mongoid/mongoid/issues/756
+    (pending "Fails on Mongoid < 2.1"; break) if defined?(Mongoid) && Mongoid::VERSION.to_f < 2.1
+
    create_user
    get new_user_registration_path

--- a/test/integration/rememberable_test.rb
+++ b/test/integration/rememberable_test.rb
@@ -12,7 +12,13 @@ class RememberMeTest < Devise::IntegrationTest
  end

  def generate_signed_cookie(raw_cookie)
-    request = ActionController::TestRequest.create(Class.new) # needs a "controller class"
+    request = if Devise::Test.rails51? || Devise::Test.rails52_and_up?
+      ActionController::TestRequest.create(Class.new) # needs a "controller class"
+    elsif Devise::Test.rails5?
+      ActionController::TestRequest.create
+    else
+      ActionController::TestRequest.new
+    end
    request.cookie_jar.signed['raw_cookie'] = raw_cookie
    request.cookie_jar['raw_cookie']
  end
--- a/test/integration/timeoutable_test.rb
+++ b/test/integration/timeoutable_test.rb
@@ -167,17 +167,6 @@ class SessionTimeoutTest < Devise::IntegrationTest
    end
  end

-  test 'error message redirect respects i18n locale set' do
-    user = sign_in_as_user
-
-    get expire_user_path(user)
-    get root_path(locale: "pt-BR")
-    follow_redirect!
-
-    assert_contain 'Sua sessão expirou. Por favor faça o login novamente para continuar.'
-    assert_not warden.authenticated?(:user)
-  end
-
  test 'time out not triggered if remembered' do
    user = sign_in_as_user remember_me: true
    get expire_user_path(user)
@@ -191,9 +180,7 @@ class SessionTimeoutTest < Devise::IntegrationTest
  test 'does not crash when the last_request_at is a String' do
    user = sign_in_as_user

-    assert_nothing_raised do
-      get edit_form_user_path(user, last_request_at: Time.now.utc.to_s)
-      get users_path
-    end
+    get edit_form_user_path(user, last_request_at: Time.now.utc.to_s)
+    get users_path
  end
 end
--- a/test/mailers/mailer_test.rb
+++ b/test/mailers/mailer_test.rb
@@ -17,30 +17,4 @@ class MailerTest < ActionMailer::TestCase

    assert mail.content_transfer_encoding, "7bit"
  end
-
-  test "default values defined as proc with different arity are handled correctly" do
-    class TestMailerWithDefault < Devise::Mailer
-      default from: -> { computed_from }
-      default reply_to: ->(_) { computed_reply_to }
-
-      def confirmation_instructions(record, token, opts = {})
-        @token = token
-        devise_mail(record, :confirmation_instructions, opts)
-      end
-
-      private
-
-      def computed_from
-        "from@example.com"
-      end
-
-      def computed_reply_to
-        "reply_to@example.com"
-      end
-    end
-
-    mail = TestMailerWithDefault.confirmation_instructions(create_user, "confirmation-token")
-    assert mail.from, "from@example.com"
-    assert mail.reply_to, "reply_to@example.com"
-  end
 end
--- a/test/models/serializable_test.rb
+++ b/test/models/serializable_test.rb
@@ -31,6 +31,12 @@ class SerializableTest < ActiveSupport::TestCase
    assert_key "username", @user.as_json({ only: :username, except: [:email].freeze }.freeze)["user"]
  end

+  test 'constant `BLACKLIST_FOR_SERIALIZATION` is deprecated' do
+    assert_deprecated("Devise::Models::Authenticatable::UNSAFE_ATTRIBUTES_FOR_SERIALIZATION", Devise.deprecator) do
+      Devise::Models::Authenticatable::BLACKLIST_FOR_SERIALIZATION
+    end
+  end
+
  def assert_key(key, subject)
    assert subject.key?(key), "Expected #{subject.inspect} to have key #{key.inspect}"
  end
--- a/test/models_test.rb
+++ b/test/models_test.rb
@@ -26,8 +26,8 @@ class ActiveRecordTest < ActiveSupport::TestCase
  test 'validations options are not applied too late' do
    validators = WithValidation.validators_on :password
    length = validators.find { |v| v.kind == :length }
-    assert_equal 2, length.options[:minimum].call
-    assert_equal 6, length.options[:maximum].call
+    assert_equal 2, length.options[:minimum]
+    assert_equal 6, length.options[:maximum]
  end

  test 'validations are applied just once' do
@@ -90,7 +90,7 @@ class ActiveRecordTest < ActiveSupport::TestCase
      def send_devise_notification(*); end
    end

-    assert_nothing_raised { klass.create! }
+    klass.create!
  end
 end

--- a/test/orm/active_record.rb
+++ b/test/orm/active_record.rb
@@ -7,11 +7,22 @@ ActiveRecord::Base.include_root_in_json = true
 migrate_path = File.expand_path("../../rails_app/db/migrate/", __FILE__)
 if Devise::Test.rails71_and_up?
  ActiveRecord::MigrationContext.new(migrate_path).migrate
-else
+elsif Devise::Test.rails6_and_up?
  ActiveRecord::MigrationContext.new(migrate_path, ActiveRecord::SchemaMigration).migrate
+elsif Devise::Test.rails52_and_up?
+  ActiveRecord::MigrationContext.new(migrate_path).migrate
+else
+  ActiveRecord::Migrator.migrate(migrate_path)
 end

 class ActiveSupport::TestCase
-  self.use_transactional_tests = true
+  if Devise::Test.rails5_and_up?
+    self.use_transactional_tests = true
+  else
+    # Let `after_commit` work with transactional fixtures, however this is not needed for Rails 5.
+    require 'test_after_commit'
+    self.use_transactional_fixtures = true
+  end
+
  self.use_instantiated_fixtures  = false
 end
--- a/test/orm/mongoid.rb
+++ b/test/orm/mongoid.rb
@@ -10,6 +10,6 @@ end

 class ActiveSupport::TestCase
  setup do
-    Mongoid::Config.purge!
+    Mongoid.default_session.drop
  end
 end
--- a/test/rails_app/app/controllers/admins_controller.rb
+++ b/test/rails_app/app/controllers/admins_controller.rb
@@ -1,8 +1,15 @@
 # frozen_string_literal: true

 class AdminsController < ApplicationController
+  around_action :set_locale
  before_action :authenticate_admin!

  def index
  end
+
+  private
+
+  def set_locale
+    I18n.with_locale(params[:locale] || I18n.default_locale) { yield }
+  end
 end
--- a/test/rails_app/app/controllers/application_controller.rb
+++ b/test/rails_app/app/controllers/application_controller.rb
@@ -5,20 +5,9 @@

 class ApplicationController < ActionController::Base
  protect_from_forgery
-  around_action :set_locale
  before_action :current_user, unless: :devise_controller?
  before_action :authenticate_user!, if: :devise_controller?
  respond_to(*Mime::SET.map(&:to_sym))

  devise_group :commenter, contains: [:user, :admin]
-
-  private
-
-  def set_locale
-    I18n.with_locale(params[:locale] || I18n.default_locale) { yield }
-  end
-
-  def default_url_options
-    {locale: params[:locale]}.compact
-  end
 end
--- a/test/rails_app/app/controllers/home_controller.rb
+++ b/test/rails_app/app/controllers/home_controller.rb
@@ -22,6 +22,10 @@ class HomeController < ApplicationController
  end

  def unauthenticated
-    render body: "unauthenticated", status: :unauthorized
+    if Devise::Test.rails5_and_up?
+      render body: "unauthenticated", status: :unauthorized
+    else
+      render text: "unauthenticated", status: :unauthorized
+    end
  end
 end
--- a/test/rails_app/app/controllers/streaming_controller.rb
+++ b/test/rails_app/app/controllers/streaming_controller.rb
@@ -6,6 +6,18 @@ class StreamingController < ApplicationController
  before_action :authenticate_user!

  def index
-    render body: 'Index'
+    render (Devise::Test.rails5_and_up? ? :body : :text) => 'Index'
+  end
+
+  # Work around https://github.com/heartcombo/devise/issues/2332, which affects
+  # tests in Rails 4.x (and affects production in Rails >= 5)
+  def process(name)
+    super(name)
+  rescue ArgumentError => e
+    if e.message == 'uncaught throw :warden'
+      throw :warden
+    else
+      raise e
+    end
  end
 end
--- a/test/rails_app/app/controllers/users/omniauth_callbacks_controller.rb
+++ b/test/rails_app/app/controllers/users/omniauth_callbacks_controller.rb
@@ -11,6 +11,6 @@ class Users::OmniauthCallbacksController < Devise::OmniauthCallbacksController
    user = User.to_adapter.find_first(email: 'user@test.com')
    user.remember_me = true
    sign_in user
-    render body: ""
+    render (Devise::Test.rails5_and_up? ? :body : :text) => ""
  end
 end
--- a/test/rails_app/app/controllers/users_controller.rb
+++ b/test/rails_app/app/controllers/users_controller.rb
@@ -16,7 +16,7 @@ class UsersController < ApplicationController
  end

  def update_form
-    render body: 'Update'
+    render (Devise::Test.rails5_and_up? ? :body : :text) => 'Update'
  end

  def accept
@@ -24,11 +24,11 @@ class UsersController < ApplicationController
  end

  def exhibit
-    render body: current_user ? "User is authenticated" : "User is not authenticated"
+    render (Devise::Test.rails5_and_up? ? :body : :text) => current_user ? "User is authenticated" : "User is not authenticated"
  end

  def expire
    user_session['last_request_at'] = 31.minutes.ago.utc
-    render body: 'User will be expired on next request'
+    render (Devise::Test.rails5_and_up? ? :body : :text) => 'User will be expired on next request'
  end
 end
--- a/test/rails_app/config/application.rb
+++ b/test/rails_app/config/application.rb
@@ -2,7 +2,6 @@

 require File.expand_path('../boot', __FILE__)

-require "logger"
 require "action_controller/railtie"
 require "action_mailer/railtie"
 require "rails/test_unit/railtie"
@@ -34,16 +33,25 @@ module RailsApp
    # config.assets.enabled = false

    config.action_mailer.default_url_options = { host: "localhost", port: 3000 }
+    rails_version = Gem::Version.new(Rails.version)
+    if DEVISE_ORM == :active_record &&
+       rails_version >= Gem::Version.new('4.2.0') &&
+       rails_version < Gem::Version.new('5.1.0')
+      config.active_record.raise_in_transactional_callbacks = true
+    end

    # This was used to break devise in some situations
    config.to_prepare do
      Devise::SessionsController.layout "application"
    end

-    if DEVISE_ORM == :active_record
-      if Devise::Test.rails70?
-        config.active_record.legacy_connection_handling = false
-      end
+    # Remove the first check once Rails 5.0 support is removed.
+    if Devise::Test.rails52_and_up? && !Devise::Test.rails6_and_up?
+      Rails.application.config.active_record.sqlite3.represent_boolean_as_integer = true
+    end
+
+    if Devise::Test.rails70?
+      config.active_record.legacy_connection_handling = false
    end

    if Devise::Test.rails70_and_up?
--- a/test/rails_app/config/boot.rb
+++ b/test/rails_app/config/boot.rb
@@ -19,6 +19,30 @@ module Devise
    def self.rails70?
      Rails.version.start_with? '7.0'
    end
+
+    def self.rails6_and_up?
+      Rails::VERSION::MAJOR >= 6
+    end
+
+    def self.rails52_and_up?
+      Rails::VERSION::MAJOR > 5 || rails52?
+    end
+
+    def self.rails52?
+      Rails.version.start_with? '5.2'
+    end
+
+    def self.rails51?
+      Rails.version.start_with? '5.1'
+    end
+
+    def self.rails5_and_up?
+      Rails::VERSION::MAJOR >= 5
+    end
+
+    def self.rails5?
+      Rails.version.start_with? '5'
+    end
  end
 end

--- a/test/rails_app/config/environments/production.rb
+++ b/test/rails_app/config/environments/production.rb
@@ -22,7 +22,13 @@ RailsApp::Application.configure do
  # config.action_dispatch.rack_cache = true

  # Disable Rails's static asset server (Apache or nginx will already do this).
-  config.public_file_server.enabled = false
+  if Devise::Test.rails5_and_up?
+    config.public_file_server.enabled = false
+  elsif Rails.version >= "4.2.0"
+    config.serve_static_files = false
+  else
+    config.serve_static_assets = false
+  end

  # Compress JavaScripts and CSS.
  config.assets.js_compressor  = :uglifier
--- a/test/rails_app/config/environments/test.rb
+++ b/test/rails_app/config/environments/test.rb
@@ -16,8 +16,16 @@ RailsApp::Application.configure do

  # Disable serving static files from the `/public` folder by default since
  # Apache or NGINX already handles this.
-  config.public_file_server.enabled = true
-  config.public_file_server.headers = {'Cache-Control' => 'public, max-age=3600'}
+  if Devise::Test.rails5_and_up?
+    config.public_file_server.enabled = true
+    config.public_file_server.headers = {'Cache-Control' => 'public, max-age=3600'}
+  elsif Rails.version >= "4.2.0"
+    config.serve_static_files = true
+    config.static_cache_control = "public, max-age=3600"
+  else
+    config.serve_static_assets = true
+    config.static_cache_control = "public, max-age=3600"
+  end

  # Show full error reports and disable caching.
  config.consider_all_requests_local       = true
--- a/test/rails_app/config/initializers/devise.rb
+++ b/test/rails_app/config/initializers/devise.rb
@@ -181,9 +181,9 @@ Devise.setup do |config|
  # If you want to use other strategies, that are not supported by Devise, or
  # change the failure app, you can configure them inside the config.warden block.
  #
-  # config.warden do |warden_config|
-  #   warden_config.failure_app = AnotherApp
-  #   warden_config.default_strategies(scope: :user).unshift :some_external_strategy
+  # config.warden do |manager|
+  #   manager.failure_app = AnotherApp
+  #   manager.default_strategies(scope: :user).unshift :some_external_strategy
  # end

  # ==> Configuration for :registerable
--- a/test/rails_app/db/migrate/20100401102949_create_tables.rb
+++ b/test/rails_app/db/migrate/20100401102949_create_tables.rb
@@ -1,6 +1,10 @@
 # frozen_string_literal: true

-class CreateTables < ActiveRecord::Migration[5.0]
+superclass = ActiveRecord::Migration
+# TODO: Inherit from the 5.0 Migration class directly when we drop support for Rails 4.
+superclass = ActiveRecord::Migration[5.0] if superclass.respond_to?(:[])
+
+class CreateTables < superclass
  def self.up
    create_table :users do |t|
      t.string :username
--- a/test/routes_test.rb
+++ b/test/routes_test.rb
@@ -205,6 +205,7 @@ class CustomizedRoutingTest < ActionController::TestCase

  test 'map with format false for sessions' do
    expected_params = {controller: 'devise/sessions', action: 'new'}
+    expected_params[:format] = false if Devise::Test.rails5_and_up?

    assert_recognizes(expected_params, {path: '/htmlonly_admin/sign_in', method: :get})
    assert_raise ExpectedRoutingError do
@@ -214,6 +215,7 @@ class CustomizedRoutingTest < ActionController::TestCase

  test 'map with format false for passwords' do
    expected_params = {controller: 'devise/passwords', action: 'create'}
+    expected_params[:format] = false if Devise::Test.rails5_and_up?

    assert_recognizes(expected_params, {path: '/htmlonly_admin/password', method: :post})
    assert_raise ExpectedRoutingError do
@@ -223,6 +225,7 @@ class CustomizedRoutingTest < ActionController::TestCase

  test 'map with format false for registrations' do
    expected_params = {controller: 'devise/registrations', action: 'new'}
+    expected_params[:format] = false if Devise::Test.rails5_and_up?

    assert_recognizes(expected_params, {path: '/htmlonly_admin/sign_up', method: :get})
    assert_raise ExpectedRoutingError do
@@ -232,6 +235,7 @@ class CustomizedRoutingTest < ActionController::TestCase

  test 'map with format false for confirmations' do
    expected_params = {controller: 'devise/confirmations', action: 'show'}
+    expected_params[:format] = false if Devise::Test.rails5_and_up?

    assert_recognizes(expected_params, {path: '/htmlonly_users/confirmation', method: :get})
    assert_raise ExpectedRoutingError do
@@ -241,6 +245,7 @@ class CustomizedRoutingTest < ActionController::TestCase

  test 'map with format false for unlocks' do
    expected_params = {controller: 'devise/unlocks', action: 'show'}
+    expected_params[:format] = false if Devise::Test.rails5_and_up?

    assert_recognizes(expected_params, {path: '/htmlonly_users/unlock', method: :get})
    assert_raise ExpectedRoutingError do
--- a/test/secret_key_finder_test.rb
+++ b/test/secret_key_finder_test.rb
@@ -0,0 +1,121 @@
+# frozen_string_literal: true
+
+require 'test_helper'
+
+class Rails52Credentials
+  def credentials
+    OpenStruct.new(secret_key_base: 'credentials')
+  end
+end
+
+class Rails52Secrets
+  def credentials
+    OpenStruct.new(secret_key_base: nil)
+  end
+
+  def secrets
+    OpenStruct.new(secret_key_base: 'secrets')
+  end
+end
+
+class Rails52Config
+  def credentials
+    OpenStruct.new(secret_key_base: nil)
+  end
+
+  def secrets
+    OpenStruct.new(secret_key_base: nil)
+  end
+
+  def config
+    OpenStruct.new(secret_key_base: 'config')
+  end
+end
+
+class Rails52SecretKeyBase
+  def credentials
+    OpenStruct.new(secret_key_base: nil)
+  end
+
+  def secrets
+    OpenStruct.new(secret_key_base: nil)
+  end
+
+  def config
+    OpenStruct.new(secret_key_base: nil)
+  end
+  
+  def secret_key_base
+    'secret_key_base'
+  end
+end
+
+class Rails41Secrets
+  def secrets
+    OpenStruct.new(secret_key_base: 'secrets')
+  end
+
+  def config
+    OpenStruct.new(secret_key_base: nil)
+  end
+end
+
+class Rails41Config
+  def secrets
+    OpenStruct.new(secret_key_base: nil)
+  end
+
+  def config
+    OpenStruct.new(secret_key_base: 'config')
+  end
+end
+
+class Rails40Config
+  def config
+    OpenStruct.new(secret_key_base: 'config')
+  end
+end
+
+class SecretKeyFinderTest < ActiveSupport::TestCase
+  test "rails 5.2 uses credentials when they're available" do
+    secret_key_finder = Devise::SecretKeyFinder.new(Rails52Credentials.new)
+
+    assert_equal 'credentials', secret_key_finder.find
+  end
+
+  test "rails 5.2 uses secrets when credentials are empty" do
+    secret_key_finder = Devise::SecretKeyFinder.new(Rails52Secrets.new)
+
+    assert_equal 'secrets', secret_key_finder.find
+  end
+
+  test "rails 5.2 uses config when secrets are empty" do
+    secret_key_finder = Devise::SecretKeyFinder.new(Rails52Config.new)
+
+    assert_equal 'config', secret_key_finder.find
+  end
+
+  test "rails 5.2 uses secret_key_base when config is empty" do
+    secret_key_finder = Devise::SecretKeyFinder.new(Rails52SecretKeyBase.new)
+
+    assert_equal 'secret_key_base', secret_key_finder.find
+  end
+
+  test "rails 4.1 uses secrets" do
+    secret_key_finder = Devise::SecretKeyFinder.new(Rails41Secrets.new)
+
+    assert_equal 'secrets', secret_key_finder.find
+  end
+
+  test "rails 4.1 uses config when secrets are empty" do
+    secret_key_finder = Devise::SecretKeyFinder.new(Rails41Config.new)
+
+    assert_equal 'config', secret_key_finder.find
+  end
+
+  test "rails 4.0 uses config" do
+    secret_key_finder = Devise::SecretKeyFinder.new(Rails40Config.new)
+
+    assert_equal 'config', secret_key_finder.find
+  end
+end
--- a/test/support/http_method_compatibility.rb
+++ b/test/support/http_method_compatibility.rb
@@ -2,8 +2,36 @@

 module Devise
  class IntegrationTest < ActionDispatch::IntegrationTest
+    # %w( get post patch put head delete xml_http_request
+    #           xhr get_via_redirect post_via_redirect
+    #         ).each do |method|
+    unless Devise::Test.rails5_and_up?
+      %w( get post put ).each do |method|
+        define_method(method) do |url, options = {}|
+          if options[:xhr] == true
+            xml_http_request __method__, url, options[:params] || {}, options[:headers]
+          else
+            super url, options[:params] || {}, options[:headers]
+          end
+        end
+      end
+    end
  end

  class ControllerTestCase < ActionController::TestCase
+    # %w( get post patch put head delete xml_http_request
+    #           xhr get_via_redirect post_via_redirect
+    #         ).each do |method|
+    unless Devise::Test.rails5_and_up?
+      %w( get post put ).each do |method|
+        define_method(method) do |action, options = {}|
+          if options[:xhr] == true
+            xml_http_request __method__, action, options[:params] || {}, options[:headers]
+          else
+            super action, options[:params] || {}, options[:headers]
+          end
+        end
+      end
+    end
  end
 end
--- a/test/support/locale/pt-BR.yml
+++ b/test/support/locale/pt-BR.yml
@@ -3,5 +3,3 @@ pt-BR:
    failure:
      invalid: "%{authentication_keys} ou senha inválidos."
      unauthenticated: "Para continuar, faça login ou registre-se."
-      timeout: "Sua sessão expirou. Por favor faça o login novamente para continuar."
-      unconfirmed: "Você precisa confirmar seu email para continuar."
--- a/test/support/mongoid.yml
+++ b/test/support/mongoid.yml
@@ -1,5 +1,5 @@
 test:
-  clients:
+  <%= Mongoid::VERSION.to_i > 4 ? 'clients' : 'sessions' %>:
    default:
      database: devise-test-suite
      hosts:
--- a/test/support/webrat/matchers.rb
+++ b/test/support/webrat/matchers.rb
@@ -3,14 +3,10 @@ module Webrat
  module Matchers
    class HaveSelector
      def query
-        Nokogiri::CSS::Parser.new.parse(@expected.to_s).map do |ast|
-          if ::Gem::Version.new(Nokogiri::VERSION) < ::Gem::Version.new('1.17.2')
-            ast.to_xpath('//', Nokogiri::CSS::XPathVisitor.new)
-          else
-            ast.to_xpath(Nokogiri::CSS::XPathVisitor.new)
-          end
+        Nokogiri::CSS.parse(@expected.to_s).map do |ast|
+          ast.to_xpath("//", Nokogiri::CSS::XPathVisitor.new)
        end.first
      end
    end
  end
-end
+end
--- a/test/test/controller_helpers_test.rb
+++ b/test/test/controller_helpers_test.rb
@@ -108,11 +108,15 @@ class TestControllerHelpersTest < Devise::ControllerTestCase
  test "returns the content type of a failure app" do
    get :index, params: { format: :json }

-    assert_includes response.media_type, 'application/json'
+    if Devise::Test.rails6_and_up?
+      assert_includes response.media_type, 'application/json'
+    else
+      assert_includes response.content_type, 'application/json'
+    end
  end

  test "defined Warden after_authentication callback should not be called when sign_in is called" do
-    assert_nothing_raised do
+    begin
      Warden::Manager.after_authentication do |user, auth, opts|
        flunk "callback was called while it should not"
      end
@@ -126,7 +130,7 @@ class TestControllerHelpersTest < Devise::ControllerTestCase
  end

  test "defined Warden before_logout callback should not be called when sign_out is called" do
-    assert_nothing_raised do
+    begin
      Warden::Manager.before_logout do |user, auth, opts|
        flunk "callback was called while it should not"
      end
@@ -177,7 +181,13 @@ class TestControllerHelpersTest < Devise::ControllerTestCase
  test "creates a new warden proxy if the request object has changed" do
    old_warden_proxy = warden

-    @request = ActionController::TestRequest.create(Class.new) # needs a "controller class"
+    @request = if Devise::Test.rails51? || Devise::Test.rails52_and_up?
+      ActionController::TestRequest.create(Class.new) # needs a "controller class"
+    elsif Devise::Test.rails5?
+      ActionController::TestRequest.create
+    else
+      ActionController::TestRequest.new
+    end

    new_warden_proxy = warden

--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -23,6 +23,22 @@ end
 if ActiveSupport.respond_to?(:test_order)
  ActiveSupport.test_order = :random
 end
+class ActiveSupport::TestCase
+  if ActiveSupport.version < Gem::Version.new("5.0")
+    def assert_deprecated(match, deprecator)
+      super(match) do
+        # TODO: remove extra begin..end when dropping support for Ruby <= 2.4
+        begin
+          behavior = deprecator.behavior
+          deprecator.behavior = ActiveSupport::Deprecation.behavior
+          yield
+        ensure
+          deprecator.behavior = behavior
+        end
+      end
+    end
+  end
+end

 OmniAuth.config.logger = Logger.new('/dev/null')
Author	SHA1	Message	Date
Carlos Antonio da Silva	d5a48b49dc	Release v4.9.4	2024-04-10 09:27:12 -03:00
Carlos Antonio da Silva	bab47e1c1f	Adds Ruby 3.3 to CI on 4-stable Related: #5668	2024-04-09 17:12:52 -03:00
Carlos Antonio da Silva	cee7457d7f	Bump year [ci skip]	2024-04-09 16:58:42 -03:00
Carlos Antonio da Silva	95ed7d3dd8	Merge pull request #5641 from henryaj/patch-1 Fix README anchor link [ci skip]	2023-10-13 11:57:29 -03:00
Carlos Antonio da Silva	edffc79bf0	Respect locale set by controller in the failure app (#5567 ) A common usage of I18n with different locales is to create some around callback in the application controller that sets the locale for the entire action, via params/url/user/etc., which ensure the locale is respected for the duration of that action, and resets at the end. Devise was not respecting the locale when the authenticate failed and triggered the failure app, because that happens in a warden middleware right up in the change, by that time the controller around callback had already reset the locale back to its default, and the failure app would just translate flash messages using the default locale. Now we are passing the current locale down to the failure app via warden options, and wrapping it with an around callback, which makes the failure app respect the set I18n locale by the controller at the time the authentication failure is triggered, working as expected. (much more like a normal controller would.) I chose to introduce a callback in the failure app so we could wrap the whole `respond` action processing rather than adding individual `locale` options to the `I18n.t` calls, because that should ensure other possible `I18n.t` calls from overridden failure apps would respect the set locale as well, and makes it more like one would implement in a controller. I don't recommend people using callbacks in their own failure apps though, as this is not going to be documented as a "feature" of failures apps, it's considered "internal" and could be refactored at any point. It is possible to override the locale with the new `i18n_locale` method, which simply defaults to the passed locale from the controller. Closes #5247 Closes #5246 Related to: #3052, #4823, and possible others already closed. Related to warden: (may be closed there afterwards) https://github.com/wardencommunity/warden/issues/180 https://github.com/wardencommunity/warden/issues/170	2023-10-13 11:19:45 -03:00