Merge pull request #5032 from JanBussieck/pure-signed_in-method

Use warden’s `authenticated?` for query methods to avoid side effects
Fix test case descriptions, since we are testing proxying to 'authenticated?'
2026-01-12 00:08:34 -05:00 · 2019-09-19 14:32:41 -03:00 · 2019-09-19 17:18:02 +02:00 · 2019-09-19 17:18:02 +02:00 · 2019-09-19 10:22:30 -03:00 · 2019-09-19 10:22:30 -03:00
142 changed files with 2249 additions and 2020 deletions
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -1,169 +0,0 @@
-name: Test
-on: [push, pull_request]
-jobs:
-  test:
-    strategy:
-      fail-fast: false
-      matrix:
-        gemfile:
-          - Gemfile
-          - gemfiles/Gemfile-rails-main
-          - 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:
-          - '3.2'
-          - '3.1'
-          - '3.0'
-          - '2.7'
-          - '2.6'
-          - '2.5'
-          - '2.4'
-          - '2.3'
-          - '2.2'
-          - '2.1'
-        env:
-          - DEVISE_ORM=active_record
-          - DEVISE_ORM=mongoid
-        exclude:
-          - 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-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.2'
-          - gemfile: gemfiles/Gemfile-rails-6-0
-            ruby: '3.1'
-          - 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.2'
-          - gemfile: gemfiles/Gemfile-rails-5-2
-            ruby: '3.1'
-          - gemfile: gemfiles/Gemfile-rails-5-2
-            ruby: '3.0'
-          - gemfile: gemfiles/Gemfile-rails-5-2
-            ruby: '2.7'
-          - 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.2'
-          - gemfile: gemfiles/Gemfile-rails-5-1
-            ruby: '3.1'
-          - gemfile: gemfiles/Gemfile-rails-5-1
-            ruby: '3.0'
-          - gemfile: gemfiles/Gemfile-rails-5-1
-            ruby: '2.7'
-          - 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.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.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.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'
-    runs-on: ubuntu-latest
-    env: # $BUNDLE_GEMFILE must be set at the job level, so it is set for all steps
-      BUNDLE_GEMFILE: ${{ matrix.gemfile }}
-    steps:
-      - uses: actions/checkout@v3
-      - name: Setup Bundler 1.x for Rails 4.x
-        if: ${{ matrix.gemfile == 'gemfiles/Gemfile-rails-4-1' || matrix.gemfile == 'gemfiles/Gemfile-rails-4-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
-          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/.gitignore
+++ b/.gitignore
@@ -8,4 +8,3 @@ rdoc/*
 pkg
 log
 test/tmp/*
-gemfiles/*.lock
--- a/.travis.yml
+++ b/.travis.yml
@@ -0,0 +1,57 @@
+language: ruby
+
+rvm:
+  - 2.3.8
+  - 2.4.5
+  - 2.5.3
+  - 2.6.0
+  - ruby-head
+
+gemfile:
+  - Gemfile
+  - gemfiles/Gemfile.rails-6.0-stable
+  - gemfiles/Gemfile.rails-5.2-stable
+  - gemfiles/Gemfile.rails-5.0-stable
+
+matrix:
+  exclude:
+    - rvm: 2.3.8
+      gemfile: gemfiles/Gemfile.rails-6.0-stable
+    - rvm: 2.4.5
+      gemfile: gemfiles/Gemfile.rails-6.0-stable
+    - rvm: 2.5.3
+    - env: DEVISE_ORM=mongoid
+      gemfile: Gemfile
+    - env: DEVISE_ORM=mongoid
+      gemfile: gemfiles/Gemfile.rails-5.0-stable
+    - env: DEVISE_ORM=mongoid
+      gemfile: gemfiles/Gemfile.rails-5.2-stable
+    - env: DEVISE_ORM=mongoid
+      gemfile: gemfiles/Gemfile.rails-6.0-stable
+  allow_failures:
+    - rvm: ruby-head
+    - gemfile: gemfiles/Gemfile.rails-6.0-stable
+
+services:
+  - mongodb
+
+cache: bundler
+
+env:
+  matrix:
+    - DEVISE_ORM=active_record
+    - DEVISE_ORM=mongoid
+
+before_install: "rm ${BUNDLE_GEMFILE}.lock"
+
+before_script: "bundle update"
+
+script: "bin/test"
+
+notifications:
+  email: false
+  slack:
+    on_pull_requests: false
+    on_success: change
+    on_failure: always
+    secure: Q3M+kmude3FjisibEeeGe0wSMXgvwLH+vL7Zrx9//q4QtkfnrQ/BBMvY9KXxPEsNF+eys4YopYjTkJ8uRmeboUATW/oQ4Jrv3+u3zkIHK2sFn/Q2cQWpK5w+CbgEnHPjKYnUu34b09njXTgDlr/mqtbPqrKeZ1dLlpKXCB/q4GY=
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,81 +1,16 @@
+### 5.0.0-rc
+
+* enhancements
+  * Suport multiple translations according to unlock strategy (by @sivagollapalli)
+  * Use `ActiveSupport::SecurityUtils.secure_compare` inside `Devise.secure_compare` (by @shrirambalakrishnan)
+  * Update trackable fields only in a database sign in (by @waiting-for-dev)
+
+* deprecations
+  * Remove Rails 4, Ruby 2.1 and Ruby 2.2 support (by @feliperenan)
+
 ### Unreleased
-
-* 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

@@ -98,7 +33,7 @@
 ### 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)
+  * 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/plataformatec/devise/issues/5033#issuecomment-476386275 (by @mracos)

 ### 4.6.1 - 2019-02-11

@@ -145,7 +80,7 @@
  * 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)
+  * Update `simple_form` templates with changes from https://github.com/plataformatec/devise/commit/16b3d6d67c7e017d461ea17ed29ea9738dc77e83 and https://github.com/plataformatec/devise/commit/6260c29a867b9a656f1e1557abe347a523178fab (by @gssbzn)
  * Remove `:trackable` from the default modules in the generators, to be more GDPR-friendly (by @fakenine)

 * bug fixes
@@ -392,5 +327,5 @@ configured (by @joshpencheon)
    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)
+Please check [3-stable](https://github.com/plataformatec/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@googlegroups.com](heartcombo@googlegroups.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 [conduct@plataformatec.com.br](conduct@plataformatec.com.br) 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
@@ -8,7 +8,7 @@ expected to follow our [Code of Conduct](CODE_OF_CONDUCT.md).
 ## Reporting Issues

 Before reporting a new issue, please be sure that the issue wasn't already
-reported or fixed by searching on GitHub through our [issues](https://github.com/heartcombo/devise/issues).
+reported or fixed by searching on GitHub through our [issues](https://github.com/plataformatec/devise/issues).

 When creating a new issue, be sure to include a **title and clear description**,
 as much relevant information as possible, and either a test case example or
@@ -22,7 +22,7 @@ Please do not attempt to translate Devise built in views. The views are meant
 to be a starting point for fresh apps and not production material - eventually
 all applications will require custom views where you can write your own copy and
 translate it if the application requires it . For historical references, please look into closed
-[Issues/Pull Requests](https://github.com/heartcombo/devise/issues?q=i18n) regarding
+[Issues/Pull Requests](https://github.com/plataformatec/devise/issues?q=i18n) regarding
 internationalization.

 Avoid opening new issues to ask questions in our issues tracker. Please go through
@@ -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@googlegroups.com](mailto:heartcombo@googlegroups.com)
+e-mail to [opensource@plataformatec.com.br](mailto:opensource@plataformatec.com.br)
 instead.**

 ## Sending Pull Requests
@@ -50,7 +50,7 @@ are beneficial to a wide range of use cases or it's an application specific chan
 that might not be so valuable to other applications. Some changes can be introduced
 as a new `devise-something` gem instead of belonging to the main codebase.

-When adding new settings, you can take advantage of the [`Devise::Models.config`](https://github.com/heartcombo/devise/blob/245b1f9de0b3386b7913e14b60ea24f43b77feb0/lib/devise/models.rb#L13-L50) method to add class and instance level fallbacks
+When adding new settings, you can take advantage of the [`Devise::Models.config`](https://github.com/plataformatec/devise/blob/245b1f9de0b3386b7913e14b60ea24f43b77feb0/lib/devise/models.rb#L13-L50) method to add class and instance level fallbacks
 to the new setting.

 We also welcome Pull Requests that improve our existing documentation (both our
@@ -66,7 +66,7 @@ you can do:
 * Help ensure that existing issues follows the recommendations from the
 _[Reporting Issues](#reporting-issues)_ section, providing feedback to the issue's
 author on what might be missing.
-* Review and update the existing content of our [Wiki](https://github.com/heartcombo/devise/wiki)
+* Review and update the existing content of our [Wiki](https://github.com/plataformatec/devise/wiki)
 with up to date instructions and code samples - the wiki was grown with several
 different tutorials and references that we can't keep track of everything, so if
 there is a page that showcases an integration or customization that you are
--- a/26
+++ b/26
@@ -4,33 +4,35 @@ source "https://rubygems.org"

 gemspec

-gem "rails", "~> 7.0.0"
-gem "omniauth"
+gem "rails", "~> 5.2"
+gem "omniauth", "~> 1.3"
+gem "oauth2"
 gem "omniauth-oauth2"
 gem "rdoc"

-gem "rails-controller-testing", github: "rails/rails-controller-testing"
+gem "activemodel-serializers-xml", github: "rails/activemodel-serializers-xml"

-gem "responders", "~> 3.1"
+gem "rails-controller-testing"
+
+gem "responders", "~> 2.4"

 group :test do
  gem "omniauth-facebook"
  gem "omniauth-openid"
-  gem "rexml"
  gem "timecop"
  gem "webrat", "0.7.3", require: false
  gem "mocha", "~> 1.1", require: false
 end

-platforms :ruby do
-  gem "sqlite3", "~> 1.4"
+platforms :jruby do
+  gem "activerecord-jdbc-adapter"
+  gem "activerecord-jdbcsqlite3-adapter"
+  gem "jruby-openssl"
 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

 # TODO:
 # group :mongoid do
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,241 +1,204 @@
 GIT
-  remote: https://github.com/rails/rails-controller-testing.git
-  revision: 351c0162df0771c0c48e6a5a886c4c2f0a5d1a74
+  remote: git://github.com/rails/activemodel-serializers-xml.git
+  revision: dd9c0acf26aab111ebc647cd8deb99ebc6946531
  specs:
-    rails-controller-testing (1.0.5)
-      actionpack (>= 5.0.1.rc1)
-      actionview (>= 5.0.1.rc1)
-      activesupport (>= 5.0.1.rc1)
+    activemodel-serializers-xml (1.0.1)
+      activemodel (> 5.x)
+      activesupport (> 5.x)
+      builder (~> 3.1)

 PATH
  remote: .
  specs:
-    devise (4.9.2)
+    devise (4.7.1)
      bcrypt (~> 3.0)
      orm_adapter (~> 0.1)
-      railties (>= 4.1.0)
+      railties (>= 5.0)
      responders
      warden (~> 1.2.3)

 GEM
  remote: https://rubygems.org/
  specs:
-    actioncable (7.0.4.3)
-      actionpack (= 7.0.4.3)
-      activesupport (= 7.0.4.3)
+    actioncable (5.2.0)
+      actionpack (= 5.2.0)
      nio4r (~> 2.0)
      websocket-driver (>= 0.6.1)
-    actionmailbox (7.0.4.3)
-      actionpack (= 7.0.4.3)
-      activejob (= 7.0.4.3)
-      activerecord (= 7.0.4.3)
-      activestorage (= 7.0.4.3)
-      activesupport (= 7.0.4.3)
-      mail (>= 2.7.1)
-      net-imap
-      net-pop
-      net-smtp
-    actionmailer (7.0.4.3)
-      actionpack (= 7.0.4.3)
-      actionview (= 7.0.4.3)
-      activejob (= 7.0.4.3)
-      activesupport (= 7.0.4.3)
+    actionmailer (5.2.0)
+      actionpack (= 5.2.0)
+      actionview (= 5.2.0)
+      activejob (= 5.2.0)
      mail (~> 2.5, >= 2.5.4)
-      net-imap
-      net-pop
-      net-smtp
      rails-dom-testing (~> 2.0)
-    actionpack (7.0.4.3)
-      actionview (= 7.0.4.3)
-      activesupport (= 7.0.4.3)
-      rack (~> 2.0, >= 2.2.0)
+    actionpack (5.2.0)
+      actionview (= 5.2.0)
+      activesupport (= 5.2.0)
+      rack (~> 2.0)
      rack-test (>= 0.6.3)
      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (7.0.4.3)
-      actionpack (= 7.0.4.3)
-      activerecord (= 7.0.4.3)
-      activestorage (= 7.0.4.3)
-      activesupport (= 7.0.4.3)
-      globalid (>= 0.6.0)
-      nokogiri (>= 1.8.5)
-    actionview (7.0.4.3)
-      activesupport (= 7.0.4.3)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    actionview (5.2.0)
+      activesupport (= 5.2.0)
      builder (~> 3.1)
      erubi (~> 1.4)
      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activejob (7.0.4.3)
-      activesupport (= 7.0.4.3)
+      rails-html-sanitizer (~> 1.0, >= 1.0.3)
+    activejob (5.2.0)
+      activesupport (= 5.2.0)
      globalid (>= 0.3.6)
-    activemodel (7.0.4.3)
-      activesupport (= 7.0.4.3)
-    activerecord (7.0.4.3)
-      activemodel (= 7.0.4.3)
-      activesupport (= 7.0.4.3)
-    activestorage (7.0.4.3)
-      actionpack (= 7.0.4.3)
-      activejob (= 7.0.4.3)
-      activerecord (= 7.0.4.3)
-      activesupport (= 7.0.4.3)
-      marcel (~> 1.0)
-      mini_mime (>= 1.1.0)
-    activesupport (7.0.4.3)
+    activemodel (5.2.0)
+      activesupport (= 5.2.0)
+    activerecord (5.2.0)
+      activemodel (= 5.2.0)
+      activesupport (= 5.2.0)
+      arel (>= 9.0)
+    activestorage (5.2.0)
+      actionpack (= 5.2.0)
+      activerecord (= 5.2.0)
+      marcel (~> 0.3.1)
+    activesupport (5.2.0)
      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 1.6, < 2)
-      minitest (>= 5.1)
-      tzinfo (~> 2.0)
-    bcrypt (3.1.18)
-    builder (3.2.4)
-    concurrent-ruby (1.2.2)
-    crass (1.0.6)
-    date (3.3.3)
-    erubi (1.12.0)
-    faraday (2.7.4)
-      faraday-net_http (>= 2.0, < 3.1)
-      ruby2_keywords (>= 0.0.4)
-    faraday-net_http (3.0.2)
-    globalid (1.1.0)
-      activesupport (>= 5.0)
-    hashie (5.0.0)
-    i18n (1.12.0)
+      i18n (>= 0.7, < 2)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+    arel (9.0.0)
+    bcrypt (3.1.13)
+    builder (3.2.3)
+    concurrent-ruby (1.0.5)
+    crass (1.0.4)
+    erubi (1.7.1)
+    faraday (0.11.0)
+      multipart-post (>= 1.2, < 3)
+    globalid (0.4.1)
+      activesupport (>= 4.2.0)
+    hashie (3.5.7)
+    i18n (1.0.0)
      concurrent-ruby (~> 1.0)
-    jwt (2.7.0)
-    loofah (2.19.1)
+    jwt (1.5.6)
+    loofah (2.2.2)
      crass (~> 1.0.2)
      nokogiri (>= 1.5.9)
-    mail (2.8.1)
+    mail (2.7.0)
      mini_mime (>= 0.1.1)
-      net-imap
-      net-pop
-      net-smtp
-    marcel (1.0.2)
-    method_source (1.0.0)
-    mini_mime (1.1.2)
-    mini_portile2 (2.8.1)
-    minitest (5.18.0)
-    mocha (1.16.1)
+    marcel (0.3.2)
+      mimemagic (~> 0.3.2)
+    metaclass (0.0.4)
+    method_source (0.9.0)
+    mimemagic (0.3.2)
+    mini_mime (1.0.0)
+    mini_portile2 (2.3.0)
+    minitest (5.11.3)
+    mocha (1.2.1)
+      metaclass (~> 0.0.1)
+    multi_json (1.12.1)
    multi_xml (0.6.0)
-    net-imap (0.3.4)
-      date
-      net-protocol
-    net-pop (0.1.2)
-      net-protocol
-    net-protocol (0.2.1)
-      timeout
-    net-smtp (0.3.3)
-      net-protocol
-    nio4r (2.5.8)
-    nokogiri (1.14.2)
-      mini_portile2 (~> 2.8.0)
-      racc (~> 1.4)
-    oauth2 (2.0.9)
-      faraday (>= 0.17.3, < 3.0)
-      jwt (>= 1.0, < 3.0)
+    multipart-post (2.0.0)
+    nio4r (2.3.0)
+    nokogiri (1.8.2)
+      mini_portile2 (~> 2.3.0)
+    oauth2 (1.3.1)
+      faraday (>= 0.8, < 0.12)
+      jwt (~> 1.0)
+      multi_json (~> 1.3)
      multi_xml (~> 0.5)
-      rack (>= 1.2, < 4)
-      snaky_hash (~> 2.0)
-      version_gem (~> 1.1)
-    omniauth (2.1.1)
-      hashie (>= 3.4.6)
-      rack (>= 2.2.3)
-      rack-protection
-    omniauth-facebook (9.0.0)
+      rack (>= 1.2, < 3)
+    omniauth (1.8.1)
+      hashie (>= 3.4.6, < 3.6.0)
+      rack (>= 1.6.2, < 3)
+    omniauth-facebook (4.0.0)
      omniauth-oauth2 (~> 1.2)
-    omniauth-oauth2 (1.8.0)
-      oauth2 (>= 1.4, < 3)
-      omniauth (~> 2.0)
-    omniauth-openid (2.0.1)
-      omniauth (>= 1.0, < 3.0)
-      rack-openid (~> 1.4.0)
+    omniauth-oauth2 (1.4.0)
+      oauth2 (~> 1.0)
+      omniauth (~> 1.2)
+    omniauth-openid (1.0.1)
+      omniauth (~> 1.0)
+      rack-openid (~> 1.3.1)
    orm_adapter (0.5.0)
-    psych (5.1.0)
-      stringio
-    racc (1.6.2)
-    rack (2.2.6.4)
-    rack-openid (1.4.2)
+    rack (2.0.4)
+    rack-openid (1.3.1)
      rack (>= 1.1.0)
      ruby-openid (>= 2.1.8)
-    rack-protection (3.0.5)
-      rack
-    rack-test (2.1.0)
-      rack (>= 1.3)
-    rails (7.0.4.3)
-      actioncable (= 7.0.4.3)
-      actionmailbox (= 7.0.4.3)
-      actionmailer (= 7.0.4.3)
-      actionpack (= 7.0.4.3)
-      actiontext (= 7.0.4.3)
-      actionview (= 7.0.4.3)
-      activejob (= 7.0.4.3)
-      activemodel (= 7.0.4.3)
-      activerecord (= 7.0.4.3)
-      activestorage (= 7.0.4.3)
-      activesupport (= 7.0.4.3)
-      bundler (>= 1.15.0)
-      railties (= 7.0.4.3)
+    rack-test (1.0.0)
+      rack (>= 1.0, < 3)
+    rails (5.2.0)
+      actioncable (= 5.2.0)
+      actionmailer (= 5.2.0)
+      actionpack (= 5.2.0)
+      actionview (= 5.2.0)
+      activejob (= 5.2.0)
+      activemodel (= 5.2.0)
+      activerecord (= 5.2.0)
+      activestorage (= 5.2.0)
+      activesupport (= 5.2.0)
+      bundler (>= 1.3.0)
+      railties (= 5.2.0)
+      sprockets-rails (>= 2.0.0)
+    rails-controller-testing (1.0.1)
+      actionpack (~> 5.x)
+      actionview (~> 5.x)
+      activesupport (~> 5.x)
    rails-dom-testing (2.0.3)
      activesupport (>= 4.2.0)
      nokogiri (>= 1.6)
-    rails-html-sanitizer (1.5.0)
-      loofah (~> 2.19, >= 2.19.1)
-    railties (7.0.4.3)
-      actionpack (= 7.0.4.3)
-      activesupport (= 7.0.4.3)
+    rails-html-sanitizer (1.0.4)
+      loofah (~> 2.2, >= 2.2.2)
+    railties (5.2.0)
+      actionpack (= 5.2.0)
+      activesupport (= 5.2.0)
      method_source
-      rake (>= 12.2)
-      thor (~> 1.0)
-      zeitwerk (~> 2.5)
-    rake (13.0.6)
-    rdoc (6.5.0)
-      psych (>= 4.0.0)
-    responders (3.1.0)
-      actionpack (>= 5.2)
-      railties (>= 5.2)
-    rexml (3.2.5)
-    ruby-openid (2.9.2)
-    ruby2_keywords (0.0.5)
-    snaky_hash (2.0.1)
-      hashie
-      version_gem (~> 1.1, >= 1.1.1)
-    sqlite3 (1.6.1)
-      mini_portile2 (~> 2.8.0)
-    stringio (3.0.5)
-    thor (1.2.1)
-    timecop (0.9.6)
-    timeout (0.3.2)
-    tzinfo (2.0.6)
+      rake (>= 0.8.7)
+      thor (>= 0.18.1, < 2.0)
+    rake (12.3.1)
+    rdoc (5.1.0)
+    responders (2.4.0)
+      actionpack (>= 4.2.0, < 5.3)
+      railties (>= 4.2.0, < 5.3)
+    ruby-openid (2.7.0)
+    sprockets (3.7.1)
      concurrent-ruby (~> 1.0)
-    version_gem (1.1.2)
-    warden (1.2.9)
-      rack (>= 2.0.9)
+      rack (> 1, < 3)
+    sprockets-rails (3.2.1)
+      actionpack (>= 4.0)
+      activesupport (>= 4.0)
+      sprockets (>= 3.0.0)
+    sqlite3 (1.3.13)
+    thor (0.20.0)
+    thread_safe (0.3.6)
+    timecop (0.8.1)
+    tzinfo (1.2.5)
+      thread_safe (~> 0.1)
+    warden (1.2.7)
+      rack (>= 1.0)
    webrat (0.7.3)
      nokogiri (>= 1.2.0)
      rack (>= 1.0)
      rack-test (>= 0.5.3)
-    websocket-driver (0.7.5)
+    websocket-driver (0.7.0)
      websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.5)
-    zeitwerk (2.6.7)
+    websocket-extensions (0.1.3)

 PLATFORMS
  ruby

 DEPENDENCIES
+  activemodel-serializers-xml!
+  activerecord-jdbc-adapter
+  activerecord-jdbcsqlite3-adapter
  devise!
+  jruby-openssl
  mocha (~> 1.1)
-  omniauth
+  oauth2
+  omniauth (~> 1.3)
  omniauth-facebook
  omniauth-oauth2
  omniauth-openid
-  rails (~> 7.0.0)
-  rails-controller-testing!
+  rails (~> 5.2)
+  rails-controller-testing
  rdoc
-  responders (~> 3.1)
-  rexml
-  sqlite3 (~> 1.4)
+  responders (~> 2.4)
+  sqlite3 (~> 1.3.6)
  timecop
  webrat (= 0.7.3)

 BUNDLED WITH
-   2.4.5
+   1.17.3
--- 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@googlegroups.com instead.
+- If you found a security bug, do not report it through GitHub. Please send an e-mail to opensource@plataformatec.com.br instead.
 - Finally, be nice and have fun!

 ## Environment
--- a/3
+++ b/3
@@ -1,5 +1,4 @@
-Copyright 2020-2023 Rafael França, Leonardo Tegon, Carlos Antônio da Silva.
-Copyright 2009-2019 Plataformatec.
+Copyright 2009-2019 Plataformatec. http://plataformatec.com.br

 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
@@ -1,4 +1,11 @@
-![Devise Logo](https://raw.github.com/heartcombo/devise/main/devise.png)
+![Devise Logo](https://raw.github.com/plataformatec/devise/master/devise.png)
+
+By [Plataformatec](http://plataformatec.com.br/).
+
+[![Build Status](https://api.travis-ci.org/plataformatec/devise.svg?branch=master)](http://travis-ci.org/plataformatec/devise)
+[![Code Climate](https://codeclimate.com/github/plataformatec/devise.svg)](https://codeclimate.com/github/plataformatec/devise)
+
+This README is [also available in a friendly navigable format](http://devise.plataformatec.com.br/).

 Devise is a flexible authentication solution for Rails based on Warden. It:

@@ -9,16 +16,16 @@ Devise is a flexible authentication solution for Rails based on Warden. It:

 It's composed of 10 modules:

-* [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.
+* [Database Authenticatable](http://www.rubydoc.info/github/plataformatec/devise/master/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/plataformatec/devise/master/Devise/Models/Omniauthable): adds OmniAuth (https://github.com/omniauth/omniauth) support.
+* [Confirmable](http://www.rubydoc.info/github/plataformatec/devise/master/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/plataformatec/devise/master/Devise/Models/Recoverable): resets the user password and sends reset instructions.
+* [Registerable](http://www.rubydoc.info/github/plataformatec/devise/master/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/plataformatec/devise/master/Devise/Models/Rememberable): manages generating and clearing a token for remembering the user from a saved cookie.
+* [Trackable](http://www.rubydoc.info/github/plataformatec/devise/master/Devise/Models/Trackable): tracks sign in count, timestamps and IP address.
+* [Timeoutable](http://www.rubydoc.info/github/plataformatec/devise/master/Devise/Models/Timeoutable): expires sessions that have not been active in a specified period of time.
+* [Validatable](http://www.rubydoc.info/github/plataformatec/devise/master/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/plataformatec/devise/master/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

@@ -51,6 +58,7 @@ It's composed of 10 modules:
 	- [Other ORMs](#other-orms)
 	- [Rails API mode](#rails-api-mode)
 - [Additional information](#additional-information)
+	- [Heroku](#heroku)
 	- [Warden](#warden)
 	- [Contributors](#contributors)
 - [License](#license)
@@ -65,15 +73,15 @@ It's composed of 10 modules:

 The Devise Wiki has lots of additional information about Devise including many "how-to" articles and answers to the most frequently asked questions. Please browse the Wiki after finishing this README:

-https://github.com/heartcombo/devise/wiki
+https://github.com/plataformatec/devise/wiki

 ### Bug reports

 If you discover a problem with Devise, we would like to know about it. However, we ask that you please review these guidelines before submitting a bug report:

-https://github.com/heartcombo/devise/wiki/Bug-reports
+https://github.com/plataformatec/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@googlegroups.com.
+If you have discovered a security related bug, please do *NOT* use the GitHub issue tracker. Send an email to opensource@plataformatec.com.br.

 ### StackOverflow and Mailing List

@@ -89,7 +97,7 @@ https://groups.google.com/group/plataformatec-devise

 You can view the Devise documentation in RDoc format here:

-http://rubydoc.info/github/heartcombo/devise/main/frames
+http://rubydoc.info/github/plataformatec/devise/master/frames

 If you need to use Devise with previous versions of Rails, you can always run "gem server" from the command line after you install the gem to access the old documentation.

@@ -97,26 +105,26 @@ If you need to use Devise with previous versions of Rails, you can always run "g

 There are a few example applications available on GitHub that demonstrate various features of Devise with different versions of Rails. You can view them here:

-https://github.com/heartcombo/devise/wiki/Example-Applications
+https://github.com/plataformatec/devise/wiki/Example-Applications

 ### Extensions

 Our community has created a number of extensions that add functionality above and beyond what is included with Devise. You can view a list of available extensions and add your own here:

-https://github.com/heartcombo/devise/wiki/Extensions
+https://github.com/plataformatec/devise/wiki/Extensions

 ### Contributing

 We hope that you will consider contributing to Devise. Please read this short overview for some information about how to get started:

-https://github.com/heartcombo/devise/wiki/Contributing
+https://github.com/plataformatec/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
-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`:
+Since Devise support 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`:
 ```
 DEVISE_ORM=mongoid bin/test

@@ -128,18 +136,18 @@ Please note that the command output will show the variable value being used.

 ### 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 2.4.2 and Rails 4.1, you can do the following:
+Inside the [gemfiles](https://github.com/plataformatec/devise/tree/master/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 on Travis 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 2.5.0 and Rails 5.0, you can do the following:
 ```bash
-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
+rbenv shell 2.5.0 # or rvm use 2.5.0
+BUNDLE_GEMFILE=gemfiles/Gemfile.rails-5.0-stable bundle install
+BUNDLE_GEMFILE=gemfiles/Gemfile.rails-5.0-stable bin/test
 ```

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

 ### Running tests
@@ -162,17 +170,17 @@ bin/test test/models/trackable_test.rb:16

 ## Starting with Rails?

-If you are building your first Rails application, we recommend you *do not* use Devise. Devise requires a good understanding of the Rails Framework. In such cases, we advise you to start a simple authentication system from scratch. Here's a few resources that should help you get started:
+If you are building your first Rails application, we recommend you *do not* use Devise. Devise requires a good understanding of the Rails Framework. In such cases, we advise you to start a simple authentication system from scratch. Today, we have three resources that should help you get started:

 * Michael Hartl's online book: https://www.railstutorial.org/book/modeling_users
-* Ryan Bates' Railscasts: http://railscasts.com/episodes/250-authentication-from-scratch and http://railscasts.com/episodes/250-authentication-from-scratch-revised
+* Ryan Bates' Railscast: http://railscasts.com/episodes/250-authentication-from-scratch
 * Codecademy's Ruby on Rails: Authentication and Authorization: https://www.codecademy.com/learn/rails-auth

 Once you have solidified your understanding of Rails and authentication mechanisms, we assure you Devise will be very pleasant to work with. :smiley:

 ## Getting started

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

 ```ruby
 gem 'devise'
@@ -269,9 +277,9 @@ Besides `:stretches`, you can define `:pepper`, `:encryptor`, `:confirm_within`,

 ### Strong Parameters

-The Parameter Sanitizer API has changed for Devise 4 :warning:
+![The Parameter Sanitizer API has changed for Devise 4](http://messages.hellobits.com/warning.svg?message=The%20Parameter%20Sanitizer%20API%20has%20changed%20for%20Devise%204)

-*For previous Devise versions see https://github.com/heartcombo/devise/tree/3-stable#strong-parameters*
+*For previous Devise versions see https://github.com/plataformatec/devise/tree/3-stable#strong-parameters*

 When you customize your own views, you may end up adding new attributes to forms. Rails 4 moved the parameter sanitization from the model to the controller, causing Devise to handle this concern at the controller as well.

@@ -281,7 +289,7 @@ There are just three actions in Devise that allow any set of parameters to be pa
 * `sign_up` (`Devise::RegistrationsController#create`) - Permits authentication keys plus `password` and `password_confirmation`
 * `account_update` (`Devise::RegistrationsController#update`) - Permits authentication keys plus `password`, `password_confirmation` and `current_password`

-In case you want to permit additional parameters (the lazy way™), you can do so using a simple before action in your `ApplicationController`:
+In case you want to permit additional parameters (the lazy way™), you can do so using a simple before filter in your `ApplicationController`:

 ```ruby
 class ApplicationController < ActionController::Base
@@ -309,7 +317,7 @@ class ApplicationController < ActionController::Base
 end
 ```

-Devise allows you to completely change Devise defaults or invoke custom behavior by passing a block:
+Devise allows you to completely change Devise defaults or invoke custom behaviour by passing a block:

 To permit simple scalar values for username and email, use this

@@ -382,7 +390,7 @@ $ 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.
+you can pass a list of modules to the generator with the `-v` flag.

 ```console
 $ rails generate devise:views -v registrations confirmations
@@ -410,7 +418,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 a controller, for example: `rails generate devise:controllers users -c=sessions`)

 2. Tell the router to use this controller:

@@ -418,7 +426,7 @@ If the customization at the views level is not enough, you can customize each co
    devise_for :users, controllers: { sessions: 'users/sessions' }
    ```

-3. Recommended but not required: copy (or move) the views from `devise/sessions` to `users/sessions`. Rails will continue using the views from `devise/sessions` due to inheritance if you skip this step, but having the views matching the controller(s) keeps things consistent.
+3. Copy the views from `devise/sessions` to `users/sessions`. Since the controller was changed, it won't use the default views located in `devise/sessions`.

 4. Finally, change or extend the desired controller actions.

@@ -432,7 +440,7 @@ If the customization at the views level is not enough, you can customize each co
    end
    ```

-    Or you can simply add new behavior to it:
+    Or you can simply add new behaviour to it:

    ```ruby
    class Users::SessionsController < Devise::SessionsController
@@ -456,7 +464,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](http://www.rubydoc.info/github/heartcombo/devise/main/ActionDispatch/Routing/Mapper%3Adevise_for) for details.
+Be sure to check `devise_for` [documentation](http://www.rubydoc.info/github/plataformatec/devise/master/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:

@@ -474,36 +482,6 @@ Please note: You will still need to add `devise_for` in your routes in order to
 devise_for :users, skip: :all
 ```

-### Hotwire/Turbo
-
-Devise integrates with Hotwire/Turbo by treating such requests as navigational, and configuring certain responses for errors and redirects to match the expected behavior. New apps are generated with the following response configuration by default, and existing apps may opt-in by adding the config to their Devise initializers:
-
-```ruby
-Devise.setup do |config|
-  # ...
-  # When using Devise with Hotwire/Turbo, the http status for error responses
-  # and some redirects must match the following. The default in Devise for existing
-  # 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_entity
-  config.responder.redirect_status = :see_other
-end
-```
-
-**Important**: these custom responses require the `responders` gem version to be `3.1.0` or higher, please make sure you update it if you're going to use this configuration. Check [this upgrade guide](https://github.com/heartcombo/devise/wiki/How-To:-Upgrade-to-Devise-4.9.0-[Hotwire-Turbo-integration]) for more info.
-
-_Note_: the above statuses configuration may become the default for Devise in a future release.
-
-There are a couple other changes you might need to make in your app to work with Hotwire/Turbo, if you're migrating from rails-ujs:
-
-* The `data-confirm` option that adds a confirmation modal to buttons/forms before submission needs to change to `data-turbo-confirm`, so that Turbo handles those appropriately.
-* The `data-method` option that sets the request method for link submissions needs to change to `data-turbo-method`. This is not necessary for `button_to` or `form`s since Turbo can handle those.
-
-If you're setting up Devise to sign out via `:delete`, and you're using links (instead of buttons wrapped in a form) to sign out with the `method: :delete` option, they will need to be updated as described above. (Devise does not provide sign out links/buttons in its shared views.)
-
-Make sure to inspect your views looking for those, and change appropriately.
-
 ### I18n

 Devise uses flash messages with I18n, in conjunction with the flash keys :notice and :alert. To customize your app, you can set up your locale file:
@@ -542,7 +520,7 @@ en:

 Take a look at our locale file to check all available messages. You may also be interested in one of the many translations that are available on our wiki:

-https://github.com/heartcombo/devise/wiki/I18n
+https://github.com/plataformatec/devise/wiki/I18n

 Caution: Devise Controllers inherit from ApplicationController. If your app uses multiple locales, you should be sure to set I18n.locale in ApplicationController.

@@ -554,21 +532,15 @@ cases/specs.

 ### Controller tests

-Controller tests require that you include `Devise::Test::IntegrationHelpers` on
+Controller tests require that you include `Devise::Test::ControllerHelpers` on
 your test case or its parent `ActionController::TestCase` superclass.
-For Rails versions prior to 5, include `Devise::Test::ControllerHelpers` instead, since the superclass
-for controller tests was changed to ActionDispatch::IntegrationTest
+For Rails 5, include `Devise::Test::IntegrationHelpers` instead, since the superclass
+for controller tests has been changed to ActionDispatch::IntegrationTest
 (for more details, see the [Integration tests](#integration-tests) section).

 ```ruby
 class PostsControllerTest < ActionController::TestCase
-  include Devise::Test::IntegrationHelpers # Rails >= 5
-end
-```
-
-```ruby
-class PostsControllerTest < ActionController::TestCase
-  include Devise::Test::ControllerHelpers # Rails < 5
+  include Devise::Test::ControllerHelpers
 end
 ```

@@ -648,7 +620,7 @@ are executed in your tests.

 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)
+* https://github.com/plataformatec/devise/wiki/How-To:-Test-controllers-with-Rails-(and-RSpec)

 ### OmniAuth

@@ -660,7 +632,7 @@ config.omniauth :github, 'APP_ID', 'APP_SECRET', scope: 'user,public_repo'

 You can read more about OmniAuth support in the wiki:

-* https://github.com/heartcombo/devise/wiki/OmniAuth:-Overview
+* https://github.com/plataformatec/devise/wiki/OmniAuth:-Overview

 ### Configuring multiple models

@@ -707,12 +679,12 @@ end

 ### Password reset tokens and Rails logs

-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:
+If you enable the [Recoverable](http://rubydoc.info/github/plataformatec/devise/master/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.

-Rails sets the production logger level to INFO by default. Consider changing your production logger level to WARN if you wish to prevent tokens from being leaked into your logs. In `config/environments/production.rb`:
+Rails sets the production logger level to DEBUG by default. Consider changing your production logger level to WARN if you wish to prevent tokens from being leaked into your logs. In `config/environments/production.rb`:

 ```ruby
 config.log_level = :warn
@@ -725,48 +697,41 @@ Devise supports ActiveRecord (default) and Mongoid. To select another ORM, simpl

 ### Rails API Mode

-Rails 5+ has a built-in [API Mode](https://edgeguides.rubyonrails.org/api_app.html) which optimizes Rails for use as an API (only). Devise is _somewhat_ able to handle applications that are built in this mode without additional modifications in the sense that it should not raise exceptions and the like. But some issues may still arise during `development`/`testing`, as we still don't know the full extent of this compatibility. (For more information, see [issue #4947](https://github.com/heartcombo/devise/issues/4947/))
-
-#### Supported Authentication Strategies
-API-only applications don't support browser-based authentication via cookies, which is devise's default. Yet, devise can still provide authentication out of the box in those cases with the `http_authenticatable` strategy, which uses HTTP Basic Auth and authenticates the user on each request. (For more info, see this wiki article for [How To: Use HTTP Basic Authentication](https://github.com/heartcombo/devise/wiki/How-To:-Use-HTTP-Basic-Authentication))
-
-The devise default for HTTP Auth is disabled, so it will need to be enabled in the devise initializer for the database strategy:
-
-```ruby
-config.http_authenticatable = [:database]
-```
-
-This restriction does not limit you from implementing custom warden strategies, either in your application or via gem-based extensions for devise.
-A common authentication strategy for APIs is token-based authentication. For more information on extending devise to support this type of authentication and others, see the wiki article for [Simple Token Authentication Examples and alternatives](https://github.com/heartcombo/devise/wiki/How-To:-Simple-Token-Authentication-Example#alternatives) or this blog post on [Custom authentication methods with Devise](http://blog.plataformatec.com.br/2019/01/custom-authentication-methods-with-devise/).
-
-#### Testing
-API Mode changes the order of the middleware stack, and this can cause problems for `Devise::Test::IntegrationHelpers`. This problem usually surfaces as an ```undefined method `[]=' for nil:NilClass``` error when using integration test helpers, such as `#sign_in`. The solution is simply to reorder the middlewares by adding the following to test.rb:
+Rails 5+ has a built-in [API Mode](https://edgeguides.rubyonrails.org/api_app.html) which optimizes Rails for use as an API (only). One of the side effects is that it changes the order of the middleware stack, and this can cause problems for `Devise::Test::IntegrationHelpers`. This problem usually surfaces as an ```undefined method `[]=' for nil:NilClass``` error when using integration test helpers, such as `#sign_in`. The solution is simply to reorder the middlewares by adding the following to test.rb:

 ```ruby
 Rails.application.config.middleware.insert_before Warden::Manager, ActionDispatch::Cookies
 Rails.application.config.middleware.insert_before Warden::Manager, ActionDispatch::Session::CookieStore
 ```

-For a deeper understanding of this, review [this issue](https://github.com/heartcombo/devise/issues/4696).
-
-Additionally be mindful that without views supported, some email-based flows from Confirmable, Recoverable and Lockable are not supported directly at this time.
+For a deeper understanding of this, review [this issue](https://github.com/plataformatec/devise/issues/4696).

 ## Additional information

+### Heroku
+
+Using Devise on Heroku with Ruby on Rails 3.2 requires setting:
+
+```ruby
+config.assets.initialize_on_precompile = false
+```
+
+Read more about the potential issues at http://guides.rubyonrails.org/asset_pipeline.html
+
 ### Warden

 Devise is based on Warden, which is a general Rack authentication framework created by Daniel Neighman. We encourage you to read more about Warden here:

-https://github.com/wardencommunity/warden
+https://github.com/hassox/warden

 ### Contributors

 We have a long list of valued contributors. Check them all at:

-https://github.com/heartcombo/devise/graphs/contributors
+https://github.com/plataformatec/devise/graphs/contributors

 ## License

-MIT License. Copyright 2020-2023 Rafael França, Leonardo Tegon, Carlos Antônio da Silva. Copyright 2009-2019 Plataformatec.
+MIT License. Copyright 2009-2019 Plataformatec. http://plataformatec.com.br

-The Devise logo is licensed under [Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International License](https://creativecommons.org/licenses/by-nc-nd/4.0/).
+You are not granted rights or licenses to the trademarks of Plataformatec, including without limitation the Devise name or logo.
--- a/app/controllers/devise/confirmations_controller.rb
+++ b/app/controllers/devise/confirmations_controller.rb
@@ -27,7 +27,6 @@ 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`.
      respond_with_navigational(resource.errors, status: :unprocessable_entity){ render :new }
    end
  end
--- a/app/controllers/devise/passwords_controller.rb
+++ b/app/controllers/devise/passwords_controller.rb
@@ -36,7 +36,7 @@ class Devise::PasswordsController < DeviseController

    if resource.errors.empty?
      resource.unlock_access! if unlockable?(resource)
-      if resource_class.sign_in_after_reset_password
+      if Devise.sign_in_after_reset_password
        flash_message = resource.active_for_authentication? ? :updated : :updated_not_active
        set_flash_message!(:notice, flash_message)
        resource.after_database_authentication
@@ -47,13 +47,18 @@ class Devise::PasswordsController < DeviseController
      respond_with resource, location: after_resetting_password_path_for(resource)
    else
      set_minimum_password_length
-      respond_with resource
+
+      if expired_token_error?(resource)
+        redirect_to new_password_path(resource_name), alert: t('devise.passwords.expired_token')
+      else
+        respond_with resource
+      end
    end
  end

  protected
    def after_resetting_password_path_for(resource)
-      resource_class.sign_in_after_reset_password ? after_sign_in_path_for(resource) : new_session_path(resource_name)
+      Devise.sign_in_after_reset_password ? after_sign_in_path_for(resource) : new_session_path(resource_name)
    end

    # The path used after sending reset password instructions
@@ -80,4 +85,9 @@ class Devise::PasswordsController < DeviseController
    def translation_scope
      'devise.passwords'
    end
+
+  private
+    def expired_token_error?(resource)
+      resource.errors.details[:reset_password_token].any? { |error| error[:error] == :expired }
+    end
 end
--- a/app/controllers/devise/registrations_controller.rb
+++ b/app/controllers/devise/registrations_controller.rb
@@ -67,7 +67,7 @@ class Devise::RegistrationsController < DeviseController
    Devise.sign_out_all_scopes ? sign_out : sign_out(resource_name)
    set_flash_message! :notice, :destroyed
    yield resource if block_given?
-    respond_with_navigational(resource){ redirect_to after_sign_out_path_for(resource_name), status: Devise.responder.redirect_status }
+    respond_with_navigational(resource){ redirect_to after_sign_out_path_for(resource_name) }
  end

  # GET /resource/cancel
--- 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
+    respond_to_on_destroy(status: :no_content)
  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
+      respond_to_on_destroy(status: :unauthorized)
    end
  end

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

-  def respond_to_on_destroy
+  def respond_to_on_destroy(status:)
    # 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 :no_content }
-      format.any(*navigational_formats) { redirect_to after_sign_out_path_for(resource_name), status: Devise.responder.redirect_status }
+      format.all { head status }
+      format.any(*navigational_formats) { redirect_to after_sign_out_path_for(resource_name) }
    end
  end
 end
--- a/app/controllers/devise/unlocks_controller.rb
+++ b/app/controllers/devise/unlocks_controller.rb
@@ -29,7 +29,6 @@ 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`.
      respond_with_navigational(resource.errors, status: :unprocessable_entity){ render :new }
    end
  end
--- a/app/controllers/devise_controller.rb
+++ b/app/controllers/devise_controller.rb
@@ -15,7 +15,6 @@ class DeviseController < Devise.parent_controller.constantize
  end

  prepend_before_action :assert_is_devise_resource!
-  self.responder = Devise.responder
  respond_to :html if mimes_for_respond_to.empty?

  # Override prefixes to consider the scoped view.
@@ -113,7 +112,7 @@ MESSAGE
    end

    if authenticated && resource = warden.user(resource_name)
-      set_flash_message(:alert, 'already_authenticated', scope: 'devise.failure')
+      flash[:alert] = I18n.t("devise.failure.already_authenticated")
      redirect_to after_sign_in_path_for(resource)
    end
  end
@@ -185,7 +184,7 @@ MESSAGE
    options[:default] = Array(options[:default]).unshift(kind.to_sym)
    options[:resource_name] = resource_name
    options = devise_i18n_options(options)
-    I18n.t("#{options[:resource_name]}.#{kind}", **options)
+    I18n.t("#{options[:resource_name]}.#{kind}", options)
  end

  # Controllers inheriting DeviseController are advised to override this
--- a/app/helpers/devise_helper.rb
+++ b/app/helpers/devise_helper.rb
@@ -1,26 +1,14 @@
 # frozen_string_literal: true

 module DeviseHelper
-  # Retain this method for backwards compatibility, deprecated in favor of modifying the
-  # devise/shared/error_messages partial.
+  # Retain this method for backwards compatibility, deprecated in favour of modifying the
+  # devise/shared/error_messages partial
  def devise_error_messages!
    ActiveSupport::Deprecation.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.
+      [Devise] `DeviseHelper.devise_error_messages!`
+      is deprecated and it will be removed in the next major version.
+      To customize the errors styles please run `rails g devise:views` and modify the
+      `devise/shared/error_messages` partial.
    DEPRECATION

    return "" if resource.errors.empty?
--- a/app/mailers/devise/mailer.rb
+++ b/app/mailers/devise/mailer.rb
@@ -4,26 +4,26 @@ if defined?(ActionMailer)
  class Devise::Mailer < Devise.parent_mailer.constantize
    include Devise::Mailers::Helpers

-    def confirmation_instructions(record, token, opts = {})
+    def confirmation_instructions(record, token, opts={})
      @token = token
      devise_mail(record, :confirmation_instructions, opts)
    end

-    def reset_password_instructions(record, token, opts = {})
+    def reset_password_instructions(record, token, opts={})
      @token = token
      devise_mail(record, :reset_password_instructions, opts)
    end

-    def unlock_instructions(record, token, opts = {})
+    def unlock_instructions(record, token, opts={})
      @token = token
      devise_mail(record, :unlock_instructions, opts)
    end

-    def email_changed(record, opts = {})
+    def email_changed(record, opts={})
      devise_mail(record, :email_changed, opts)
    end

-    def password_change(record, opts = {})
+    def password_change(record, opts={})
      devise_mail(record, :password_change, opts)
    end
  end
--- a/app/views/devise/registrations/edit.html.erb
+++ b/app/views/devise/registrations/edit.html.erb
@@ -38,6 +38,6 @@

 <h3>Cancel my account</h3>

-<div>Unhappy? <%= button_to "Cancel my account", registration_path(resource_name), data: { confirm: "Are you sure?", turbo_confirm: "Are you sure?" }, method: :delete %></div>
+<p>Unhappy? <%= button_to "Cancel my account", registration_path(resource_name), data: { confirm: "Are you sure?" }, method: :delete %></p>

 <%= link_to "Back", :back %>
--- 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-cache="false">
+  <div id="error_explanation">
    <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
@@ -20,6 +20,6 @@

 <%- if devise_mapping.omniauthable? %>
  <%- resource_class.omniauth_providers.each do |provider| %>
-    <%= button_to "Sign in with #{OmniAuth::Utils.camelize(provider)}", omniauth_authorize_path(resource_name, provider), data: { turbo: false } %><br />
+    <%= link_to "Sign in with #{OmniAuth::Utils.camelize(provider)}", omniauth_authorize_path(resource_name, provider) %><br />
  <% end %>
 <% end %>
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1,4 +1,4 @@
-# Additional translations at https://github.com/heartcombo/devise/wiki/I18n
+# Additional translations at https://github.com/plataformatec/devise/wiki/I18n

 en:
  devise:
@@ -10,7 +10,11 @@ en:
      already_authenticated: "You are already signed in."
      inactive: "Your account is not activated yet."
      invalid: "Invalid %{authentication_keys} or password."
-      locked: "Your account is locked."
+      locked:                                                                                                 
+        none: "Your account is locked."                                                                       
+        email: "Your account is locked. An email has been sent with instructions on how to unlock your account."
+        time: "Your account is locked. Your account will become available after a certain amount of time."       
+        both: "Your account is locked. An email has been sent with instructions on how to unlock your account, or wait a certain amount of time and try again."
      last_attempt: "You have one more attempt before your account is locked."
      not_found_in_database: "Invalid %{authentication_keys} or password."
      timeout: "Your session expired. Please sign in again to continue."
@@ -36,6 +40,7 @@ en:
      send_paranoid_instructions: "If your email address exists in our database, you will receive a password recovery link at your email address in a few minutes."
      updated: "Your password has been changed successfully. You are now signed in."
      updated_not_active: "Your password has been changed successfully."
+      expired_token: "The password recovery link expired. Please request a new one."
    registrations:
      destroyed: "Bye! Your account has been successfully cancelled. We hope to see you again soon."
      signed_up: "Welcome! You have signed up successfully."
@@ -44,7 +49,7 @@ en:
      signed_up_but_unconfirmed: "A message with a confirmation link has been sent to your email address. Please follow the link to activate your account."
      update_needs_confirmation: "You updated your account successfully, but we need to verify your new email address. Please check your email and follow the confirmation link to confirm your new email address."
      updated: "Your account has been updated successfully."
-      updated_but_not_signed_in: "Your account has been updated successfully, but since your password was changed, you need to sign in again."
+      updated_but_not_signed_in: "Your account has been updated successfully, but since your password was changed, you need to sign in again"
    sessions:
      signed_in: "Signed in successfully."
      signed_out: "Signed out successfully."
--- a/devise.gemspec
+++ b/devise.gemspec
@@ -10,33 +10,18 @@ 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@googlegroups.com"
-  s.homepage    = "https://github.com/heartcombo/devise"
+  s.email       = "contact@plataformatec.com.br"
+  s.homepage    = "https://github.com/plataformatec/devise"
  s.description = "Flexible authentication solution for Rails with Warden"
  s.authors     = ['José Valim', 'Carlos Antônio']
-  s.metadata    = {
-    "homepage_uri"      => "https://github.com/heartcombo/devise",
-    "documentation_uri" => "https://rubydoc.info/github/heartcombo/devise",
-    "changelog_uri"     => "https://github.com/heartcombo/devise/blob/main/CHANGELOG.md",
-    "source_code_uri"   => "https://github.com/heartcombo/devise",
-    "bug_tracker_uri"   => "https://github.com/heartcombo/devise/issues",
-    "wiki_uri"          => "https://github.com/heartcombo/devise/wiki"
-  }

  s.files         = Dir["{app,config,lib}/**/*", "CHANGELOG.md", "MIT-LICENSE", "README.md"]
  s.require_paths = ["lib"]
-  s.required_ruby_version = '>= 2.1.0'
+  s.required_ruby_version = '>= 2.3.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", ">= 4.1.0")
+  s.add_dependency("railties", ">= 5.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-5-1
+++ b/gemfiles/Gemfile-rails-5-1
@@ -1,30 +0,0 @@
-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", "~> 1.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
--- a/gemfiles/Gemfile-rails-6-0
+++ b/gemfiles/Gemfile-rails-6-0
@@ -1,25 +0,0 @@
-source "https://rubygems.org"
-
-gemspec path: ".."
-
-gem "rails", '~> 6.0.0', github: 'rails/rails', branch: '6-0-stable'
-gem "omniauth"
-gem "omniauth-oauth2"
-gem "rdoc"
-
-gem "rails-controller-testing", github: "rails/rails-controller-testing"
-
-gem "responders", "~> 3.1"
-
-group :test do
-  gem "omniauth-facebook"
-  gem "omniauth-openid"
-  gem "rexml"
-  gem "timecop"
-  gem "webrat", "0.7.3", require: false
-  gem "mocha", "~> 1.1", require: false
-end
-
-platforms :ruby do
-  gem "sqlite3", "~> 1.4"
-end
--- a/gemfiles/Gemfile-rails-6-1
+++ b/gemfiles/Gemfile-rails-6-1
@@ -1,31 +0,0 @@
-source "https://rubygems.org"
-
-gemspec path: ".."
-
-gem "rails", '~> 6.1.0'
-gem "omniauth"
-gem "omniauth-oauth2"
-gem "rdoc"
-
-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", "0.7.3", require: false
-  gem "mocha", "~> 1.1", require: false
-end
-
-platforms :ruby do
-  gem "sqlite3", "~> 1.4"
-end
--- a/gemfiles/Gemfile.rails-4.1-stable
+++ b/gemfiles/Gemfile.rails-4.1-stable
@@ -2,11 +2,6 @@

 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"
@@ -38,9 +33,3 @@ 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
--- a/gemfiles/Gemfile.rails-4.1-stable.lock
+++ b/gemfiles/Gemfile.rails-4.1-stable.lock
@@ -0,0 +1,174 @@
+GIT
+  remote: git://github.com/rails/rails.git
+  revision: 0cad778c2605a5204a05a9f1dbd3344e39f248d8
+  branch: 4-1-stable
+  specs:
+    actionmailer (4.1.16)
+      actionpack (= 4.1.16)
+      actionview (= 4.1.16)
+      mail (~> 2.5, >= 2.5.4)
+    rails (4.1.16)
+      actionmailer (= 4.1.16)
+      actionpack (= 4.1.16)
+      actionview (= 4.1.16)
+      activemodel (= 4.1.16)
+      activerecord (= 4.1.16)
+      activesupport (= 4.1.16)
+      bundler (>= 1.3.0, < 2.0)
+      railties (= 4.1.16)
+      sprockets-rails (~> 2.0)
+
+PATH
+  remote: ..
+  specs:
+    devise (4.7.1)
+      bcrypt (~> 3.0)
+      orm_adapter (~> 0.1)
+      railties (>= 4.1.0)
+      responders
+      warden (~> 1.2.3)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actionpack (4.1.16)
+      actionview (= 4.1.16)
+      activesupport (= 4.1.16)
+      rack (~> 1.5.2)
+      rack-test (~> 0.6.2)
+    actionview (4.1.16)
+      activesupport (= 4.1.16)
+      builder (~> 3.1)
+      erubis (~> 2.7.0)
+    activemodel (4.1.16)
+      activesupport (= 4.1.16)
+      builder (~> 3.1)
+    activerecord (4.1.16)
+      activemodel (= 4.1.16)
+      activesupport (= 4.1.16)
+      arel (~> 5.0.0)
+    activesupport (4.1.16)
+      i18n (~> 0.6, >= 0.6.9)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.1)
+      tzinfo (~> 1.1)
+    arel (5.0.1.20140414130214)
+    bcrypt (3.1.13)
+    bson (3.2.6)
+    builder (3.2.3)
+    concurrent-ruby (1.0.5)
+    connection_pool (2.2.1)
+    erubis (2.7.0)
+    faraday (0.11.0)
+      multipart-post (>= 1.2, < 3)
+    hashie (3.5.5)
+    i18n (0.8.1)
+    json (1.8.6)
+    jwt (1.5.6)
+    mail (2.6.4)
+      mime-types (>= 1.16, < 4)
+    metaclass (0.0.4)
+    mime-types (3.1)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2016.0521)
+    mini_portile2 (2.4.0)
+    minitest (5.10.1)
+    mocha (1.2.1)
+      metaclass (~> 0.0.1)
+    mongoid (4.0.2)
+      activemodel (~> 4.0)
+      moped (~> 2.0.0)
+      origin (~> 2.1)
+      tzinfo (>= 0.3.37)
+    moped (2.0.7)
+      bson (~> 3.0)
+      connection_pool (~> 2.0)
+      optionable (~> 0.2.0)
+    multi_json (1.12.1)
+    multi_xml (0.6.0)
+    multipart-post (2.0.0)
+    nokogiri (1.9.1)
+      mini_portile2 (~> 2.4.0)
+    oauth2 (1.3.1)
+      faraday (>= 0.8, < 0.12)
+      jwt (~> 1.0)
+      multi_json (~> 1.3)
+      multi_xml (~> 0.5)
+      rack (>= 1.2, < 3)
+    omniauth (1.4.2)
+      hashie (>= 1.2, < 4)
+      rack (>= 1.0, < 3)
+    omniauth-facebook (4.0.0)
+      omniauth-oauth2 (~> 1.2)
+    omniauth-oauth2 (1.4.0)
+      oauth2 (~> 1.0)
+      omniauth (~> 1.2)
+    omniauth-openid (1.0.1)
+      omniauth (~> 1.0)
+      rack-openid (~> 1.3.1)
+    optionable (0.2.0)
+    origin (2.3.0)
+    orm_adapter (0.5.0)
+    rack (1.5.5)
+    rack-openid (1.3.1)
+      rack (>= 1.1.0)
+      ruby-openid (>= 2.1.8)
+    rack-test (0.6.3)
+      rack (>= 1.0)
+    railties (4.1.16)
+      actionpack (= 4.1.16)
+      activesupport (= 4.1.16)
+      rake (>= 0.8.7)
+      thor (>= 0.18.1, < 2.0)
+    rake (12.0.0)
+    rdoc (5.1.0)
+    responders (1.1.2)
+      railties (>= 3.2, < 4.2)
+    ruby-openid (2.7.0)
+    sprockets (3.7.1)
+      concurrent-ruby (~> 1.0)
+      rack (> 1, < 3)
+    sprockets-rails (2.3.3)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      sprockets (>= 2.8, < 4.0)
+    sqlite3 (1.3.13)
+    test_after_commit (1.1.0)
+      activerecord (>= 3.2)
+    thor (0.19.4)
+    thread_safe (0.3.6)
+    timecop (0.8.1)
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
+    warden (1.2.7)
+      rack (>= 1.0)
+    webrat (0.7.3)
+      nokogiri (>= 1.2.0)
+      rack (>= 1.0)
+      rack-test (>= 0.5.3)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activerecord-jdbc-adapter
+  activerecord-jdbcsqlite3-adapter
+  devise!
+  jruby-openssl
+  mocha (~> 1.1)
+  mongoid (~> 4.0)
+  nokogiri (= 1.9.1)
+  omniauth
+  omniauth-facebook
+  omniauth-oauth2
+  omniauth-openid
+  rails!
+  rdoc (~> 5.1)
+  sqlite3 (~> 1.3.6)
+  test_after_commit
+  timecop
+  webrat (= 0.7.3)
+
+BUNDLED WITH
+   1.17.3
--- a/gemfiles/Gemfile.rails-4.2-stable
+++ b/gemfiles/Gemfile.rails-4.2-stable
@@ -2,11 +2,6 @@

 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"
@@ -37,9 +32,3 @@ 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
--- a/gemfiles/Gemfile.rails-4.2-stable.lock
+++ b/gemfiles/Gemfile.rails-4.2-stable.lock
@@ -0,0 +1,195 @@
+GIT
+  remote: git://github.com/rails/rails.git
+  revision: dc3ae21802c316e1639239d28202db7aa7fb7cac
+  branch: 4-2-stable
+  specs:
+    actionmailer (4.2.8)
+      actionpack (= 4.2.8)
+      actionview (= 4.2.8)
+      activejob (= 4.2.8)
+      mail (~> 2.5, >= 2.5.4)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+    actionpack (4.2.8)
+      actionview (= 4.2.8)
+      activesupport (= 4.2.8)
+      rack (~> 1.6)
+      rack-test (~> 0.6.2)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    actionview (4.2.8)
+      activesupport (= 4.2.8)
+      builder (~> 3.1)
+      erubis (~> 2.7.0)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.3)
+    activejob (4.2.8)
+      activesupport (= 4.2.8)
+      globalid (>= 0.3.0)
+    activemodel (4.2.8)
+      activesupport (= 4.2.8)
+      builder (~> 3.1)
+    activerecord (4.2.8)
+      activemodel (= 4.2.8)
+      activesupport (= 4.2.8)
+      arel (~> 6.0)
+    activesupport (4.2.8)
+      i18n (~> 0.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.3, >= 0.3.4)
+      tzinfo (~> 1.1)
+    rails (4.2.8)
+      actionmailer (= 4.2.8)
+      actionpack (= 4.2.8)
+      actionview (= 4.2.8)
+      activejob (= 4.2.8)
+      activemodel (= 4.2.8)
+      activerecord (= 4.2.8)
+      activesupport (= 4.2.8)
+      bundler (>= 1.3.0, < 2.0)
+      railties (= 4.2.8)
+      sprockets-rails
+    railties (4.2.8)
+      actionpack (= 4.2.8)
+      activesupport (= 4.2.8)
+      rake (>= 0.8.7)
+      thor (>= 0.18.1, < 2.0)
+
+PATH
+  remote: ..
+  specs:
+    devise (4.7.1)
+      bcrypt (~> 3.0)
+      orm_adapter (~> 0.1)
+      railties (>= 4.1.0)
+      responders
+      warden (~> 1.2.3)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    arel (6.0.4)
+    bcrypt (3.1.13)
+    bson (3.2.6)
+    builder (3.2.3)
+    concurrent-ruby (1.0.5)
+    connection_pool (2.2.1)
+    erubis (2.7.0)
+    faraday (0.11.0)
+      multipart-post (>= 1.2, < 3)
+    globalid (0.3.7)
+      activesupport (>= 4.1.0)
+    hashie (3.5.5)
+    i18n (0.8.1)
+    jwt (1.5.6)
+    loofah (2.0.3)
+      nokogiri (>= 1.5.9)
+    mail (2.6.4)
+      mime-types (>= 1.16, < 4)
+    metaclass (0.0.4)
+    mime-types (3.1)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2016.0521)
+    mini_portile2 (2.4.0)
+    minitest (5.10.1)
+    mocha (1.2.1)
+      metaclass (~> 0.0.1)
+    mongoid (4.0.2)
+      activemodel (~> 4.0)
+      moped (~> 2.0.0)
+      origin (~> 2.1)
+      tzinfo (>= 0.3.37)
+    moped (2.0.7)
+      bson (~> 3.0)
+      connection_pool (~> 2.0)
+      optionable (~> 0.2.0)
+    multi_json (1.12.1)
+    multi_xml (0.6.0)
+    multipart-post (2.0.0)
+    nokogiri (1.9.1)
+      mini_portile2 (~> 2.4.0)
+    oauth2 (1.3.1)
+      faraday (>= 0.8, < 0.12)
+      jwt (~> 1.0)
+      multi_json (~> 1.3)
+      multi_xml (~> 0.5)
+      rack (>= 1.2, < 3)
+    omniauth (1.6.1)
+      hashie (>= 3.4.6, < 3.6.0)
+      rack (>= 1.6.2, < 3)
+    omniauth-facebook (4.0.0)
+      omniauth-oauth2 (~> 1.2)
+    omniauth-oauth2 (1.4.0)
+      oauth2 (~> 1.0)
+      omniauth (~> 1.2)
+    omniauth-openid (1.0.1)
+      omniauth (~> 1.0)
+      rack-openid (~> 1.3.1)
+    optionable (0.2.0)
+    origin (2.3.0)
+    orm_adapter (0.5.0)
+    rack (1.6.5)
+    rack-openid (1.3.1)
+      rack (>= 1.1.0)
+      ruby-openid (>= 2.1.8)
+    rack-test (0.6.3)
+      rack (>= 1.0)
+    rails-deprecated_sanitizer (1.0.3)
+      activesupport (>= 4.2.0.alpha)
+    rails-dom-testing (1.0.8)
+      activesupport (>= 4.2.0.beta, < 5.0)
+      nokogiri (~> 1.6)
+      rails-deprecated_sanitizer (>= 1.0.1)
+    rails-html-sanitizer (1.0.3)
+      loofah (~> 2.0)
+    rake (12.0.0)
+    rdoc (5.1.0)
+    responders (2.4.1)
+      actionpack (>= 4.2.0, < 6.0)
+      railties (>= 4.2.0, < 6.0)
+    ruby-openid (2.7.0)
+    sprockets (3.7.1)
+      concurrent-ruby (~> 1.0)
+      rack (> 1, < 3)
+    sprockets-rails (3.2.0)
+      actionpack (>= 4.0)
+      activesupport (>= 4.0)
+      sprockets (>= 3.0.0)
+    sqlite3 (1.3.13)
+    test_after_commit (1.1.0)
+      activerecord (>= 3.2)
+    thor (0.19.4)
+    thread_safe (0.3.6)
+    timecop (0.8.1)
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
+    warden (1.2.7)
+      rack (>= 1.0)
+    webrat (0.7.3)
+      nokogiri (>= 1.2.0)
+      rack (>= 1.0)
+      rack-test (>= 0.5.3)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activerecord-jdbc-adapter
+  activerecord-jdbcsqlite3-adapter
+  devise!
+  jruby-openssl
+  mocha (~> 1.1)
+  mongoid (~> 4.0)
+  nokogiri (= 1.9.1)
+  omniauth
+  omniauth-facebook
+  omniauth-oauth2
+  omniauth-openid
+  rails!
+  rdoc (~> 5.1)
+  sqlite3 (~> 1.3.6)
+  test_after_commit
+  timecop
+  webrat (= 0.7.3)
+
+BUNDLED WITH
+   1.17.3
--- a/gemfiles/Gemfile.rails-5.0-stable
+++ b/gemfiles/Gemfile.rails-5.0-stable
@@ -9,6 +9,8 @@ gem "omniauth"
 gem "omniauth-oauth2"
 gem "rdoc"

+gem "activemodel-serializers-xml", github: "rails/activemodel-serializers-xml"
+
 gem "rails-controller-testing"

 gem "responders", "~> 2.1"
@@ -29,9 +31,3 @@ end
 # 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
--- a/gemfiles/Gemfile.rails-5.0-stable.lock
+++ b/gemfiles/Gemfile.rails-5.0-stable.lock
@@ -0,0 +1,192 @@
+GIT
+  remote: git://github.com/rails/activemodel-serializers-xml.git
+  revision: dd9c0acf26aab111ebc647cd8deb99ebc6946531
+  specs:
+    activemodel-serializers-xml (1.0.1)
+      activemodel (> 5.x)
+      activesupport (> 5.x)
+      builder (~> 3.1)
+
+PATH
+  remote: ..
+  specs:
+    devise (4.7.1)
+      bcrypt (~> 3.0)
+      orm_adapter (~> 0.1)
+      railties (>= 5.0)
+      responders
+      warden (~> 1.2.3)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actioncable (5.0.2)
+      actionpack (= 5.0.2)
+      nio4r (>= 1.2, < 3.0)
+      websocket-driver (~> 0.6.1)
+    actionmailer (5.0.2)
+      actionpack (= 5.0.2)
+      actionview (= 5.0.2)
+      activejob (= 5.0.2)
+      mail (~> 2.5, >= 2.5.4)
+      rails-dom-testing (~> 2.0)
+    actionpack (5.0.2)
+      actionview (= 5.0.2)
+      activesupport (= 5.0.2)
+      rack (~> 2.0)
+      rack-test (~> 0.6.3)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    actionview (5.0.2)
+      activesupport (= 5.0.2)
+      builder (~> 3.1)
+      erubis (~> 2.7.0)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.0.3)
+    activejob (5.0.2)
+      activesupport (= 5.0.2)
+      globalid (>= 0.3.6)
+    activemodel (5.0.2)
+      activesupport (= 5.0.2)
+    activerecord (5.0.2)
+      activemodel (= 5.0.2)
+      activesupport (= 5.0.2)
+      arel (~> 7.0)
+    activesupport (5.0.2)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (~> 0.7)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+    arel (7.1.4)
+    bcrypt (3.1.13)
+    builder (3.2.3)
+    concurrent-ruby (1.0.5)
+    erubis (2.7.0)
+    faraday (0.11.0)
+      multipart-post (>= 1.2, < 3)
+    globalid (0.4.0)
+      activesupport (>= 4.2.0)
+    hashie (3.5.5)
+    i18n (0.8.1)
+    jwt (1.5.6)
+    loofah (2.0.3)
+      nokogiri (>= 1.5.9)
+    mail (2.6.5)
+      mime-types (>= 1.16, < 4)
+    metaclass (0.0.4)
+    method_source (0.8.2)
+    mime-types (3.1)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2016.0521)
+    mini_portile2 (2.1.0)
+    minitest (5.10.1)
+    mocha (1.2.1)
+      metaclass (~> 0.0.1)
+    multi_json (1.12.1)
+    multi_xml (0.6.0)
+    multipart-post (2.0.0)
+    nio4r (2.0.0)
+    nokogiri (1.7.2)
+      mini_portile2 (~> 2.1.0)
+    oauth2 (1.3.1)
+      faraday (>= 0.8, < 0.12)
+      jwt (~> 1.0)
+      multi_json (~> 1.3)
+      multi_xml (~> 0.5)
+      rack (>= 1.2, < 3)
+    omniauth (1.6.1)
+      hashie (>= 3.4.6, < 3.6.0)
+      rack (>= 1.6.2, < 3)
+    omniauth-facebook (4.0.0)
+      omniauth-oauth2 (~> 1.2)
+    omniauth-oauth2 (1.4.0)
+      oauth2 (~> 1.0)
+      omniauth (~> 1.2)
+    omniauth-openid (1.0.1)
+      omniauth (~> 1.0)
+      rack-openid (~> 1.3.1)
+    orm_adapter (0.5.0)
+    rack (2.0.2)
+    rack-openid (1.3.1)
+      rack (>= 1.1.0)
+      ruby-openid (>= 2.1.8)
+    rack-test (0.6.3)
+      rack (>= 1.0)
+    rails (5.0.2)
+      actioncable (= 5.0.2)
+      actionmailer (= 5.0.2)
+      actionpack (= 5.0.2)
+      actionview (= 5.0.2)
+      activejob (= 5.0.2)
+      activemodel (= 5.0.2)
+      activerecord (= 5.0.2)
+      activesupport (= 5.0.2)
+      bundler (>= 1.3.0, < 2.0)
+      railties (= 5.0.2)
+      sprockets-rails (>= 2.0.0)
+    rails-controller-testing (1.0.1)
+      actionpack (~> 5.x)
+      actionview (~> 5.x)
+      activesupport (~> 5.x)
+    rails-dom-testing (2.0.3)
+      activesupport (>= 4.2.0)
+      nokogiri (>= 1.6)
+    rails-html-sanitizer (1.0.3)
+      loofah (~> 2.0)
+    railties (5.0.2)
+      actionpack (= 5.0.2)
+      activesupport (= 5.0.2)
+      method_source
+      rake (>= 0.8.7)
+      thor (>= 0.18.1, < 2.0)
+    rake (12.0.0)
+    rdoc (5.1.0)
+    responders (2.4.0)
+      actionpack (>= 4.2.0, < 5.3)
+      railties (>= 4.2.0, < 5.3)
+    ruby-openid (2.7.0)
+    sprockets (3.7.1)
+      concurrent-ruby (~> 1.0)
+      rack (> 1, < 3)
+    sprockets-rails (3.2.0)
+      actionpack (>= 4.0)
+      activesupport (>= 4.0)
+      sprockets (>= 3.0.0)
+    sqlite3 (1.3.13)
+    thor (0.19.4)
+    thread_safe (0.3.6)
+    timecop (0.8.1)
+    tzinfo (1.2.3)
+      thread_safe (~> 0.1)
+    warden (1.2.7)
+      rack (>= 1.0)
+    webrat (0.7.3)
+      nokogiri (>= 1.2.0)
+      rack (>= 1.0)
+      rack-test (>= 0.5.3)
+    websocket-driver (0.6.5)
+      websocket-extensions (>= 0.1.0)
+    websocket-extensions (0.1.2)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activemodel-serializers-xml!
+  devise!
+  mocha (~> 1.1)
+  omniauth
+  omniauth-facebook
+  omniauth-oauth2
+  omniauth-openid
+  rails (~> 5.0.0)
+  rails-controller-testing
+  rdoc
+  responders (~> 2.1)
+  sqlite3 (~> 1.3.6)
+  test_after_commit
+  timecop
+  webrat (= 0.7.3)
+
+BUNDLED WITH
+   1.17.3
--- a/gemfiles/Gemfile.rails-5.2-stable
+++ b/gemfiles/Gemfile.rails-5.2-stable
@@ -2,11 +2,13 @@ source "https://rubygems.org"

 gemspec path: ".."

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

+gem "activemodel-serializers-xml", github: "rails/activemodel-serializers-xml"
+
 gem "rails-controller-testing"

 gem "responders", "~> 2.1"
--- a/gemfiles/Gemfile.rails-5.2-stable.lock
+++ b/gemfiles/Gemfile.rails-5.2-stable.lock
@@ -0,0 +1,201 @@
+GIT
+  remote: git://github.com/rails/activemodel-serializers-xml.git
+  revision: f744aeca2747ed3134e492249c4ee39b548efdf6
+  specs:
+    activemodel-serializers-xml (1.0.2)
+      activemodel (> 5.x)
+      activesupport (> 5.x)
+      builder (~> 3.1)
+
+PATH
+  remote: ..
+  specs:
+    devise (4.7.1)
+      bcrypt (~> 3.0)
+      orm_adapter (~> 0.1)
+      railties (>= 5.0)
+      responders
+      warden (~> 1.2.3)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actioncable (5.2.1)
+      actionpack (= 5.2.1)
+      nio4r (~> 2.0)
+      websocket-driver (>= 0.6.1)
+    actionmailer (5.2.1)
+      actionpack (= 5.2.1)
+      actionview (= 5.2.1)
+      activejob (= 5.2.1)
+      mail (~> 2.5, >= 2.5.4)
+      rails-dom-testing (~> 2.0)
+    actionpack (5.2.1)
+      actionview (= 5.2.1)
+      activesupport (= 5.2.1)
+      rack (~> 2.0)
+      rack-test (>= 0.6.3)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    actionview (5.2.1)
+      activesupport (= 5.2.1)
+      builder (~> 3.1)
+      erubi (~> 1.4)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.0.3)
+    activejob (5.2.1)
+      activesupport (= 5.2.1)
+      globalid (>= 0.3.6)
+    activemodel (5.2.1)
+      activesupport (= 5.2.1)
+    activerecord (5.2.1)
+      activemodel (= 5.2.1)
+      activesupport (= 5.2.1)
+      arel (>= 9.0)
+    activestorage (5.2.1)
+      actionpack (= 5.2.1)
+      activerecord (= 5.2.1)
+      marcel (~> 0.3.1)
+    activesupport (5.2.1)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+    arel (9.0.0)
+    bcrypt (3.1.13)
+    builder (3.2.3)
+    concurrent-ruby (1.0.5)
+    crass (1.0.4)
+    erubi (1.7.1)
+    faraday (0.12.2)
+      multipart-post (>= 1.2, < 3)
+    globalid (0.4.1)
+      activesupport (>= 4.2.0)
+    hashie (3.5.7)
+    i18n (1.1.0)
+      concurrent-ruby (~> 1.0)
+    jwt (1.5.6)
+    loofah (2.2.2)
+      crass (~> 1.0.2)
+      nokogiri (>= 1.5.9)
+    mail (2.7.0)
+      mini_mime (>= 0.1.1)
+    marcel (0.3.3)
+      mimemagic (~> 0.3.2)
+    metaclass (0.0.4)
+    method_source (0.9.0)
+    mimemagic (0.3.2)
+    mini_mime (1.0.1)
+    mini_portile2 (2.3.0)
+    minitest (5.11.3)
+    mocha (1.7.0)
+      metaclass (~> 0.0.1)
+    multi_json (1.13.1)
+    multi_xml (0.6.0)
+    multipart-post (2.0.0)
+    nio4r (2.3.1)
+    nokogiri (1.8.5)
+      mini_portile2 (~> 2.3.0)
+    oauth2 (1.4.0)
+      faraday (>= 0.8, < 0.13)
+      jwt (~> 1.0)
+      multi_json (~> 1.3)
+      multi_xml (~> 0.5)
+      rack (>= 1.2, < 3)
+    omniauth (1.8.1)
+      hashie (>= 3.4.6, < 3.6.0)
+      rack (>= 1.6.2, < 3)
+    omniauth-facebook (5.0.0)
+      omniauth-oauth2 (~> 1.2)
+    omniauth-oauth2 (1.5.0)
+      oauth2 (~> 1.1)
+      omniauth (~> 1.2)
+    omniauth-openid (1.0.1)
+      omniauth (~> 1.0)
+      rack-openid (~> 1.3.1)
+    orm_adapter (0.5.0)
+    rack (2.0.5)
+    rack-openid (1.3.1)
+      rack (>= 1.1.0)
+      ruby-openid (>= 2.1.8)
+    rack-test (1.1.0)
+      rack (>= 1.0, < 3)
+    rails (5.2.1)
+      actioncable (= 5.2.1)
+      actionmailer (= 5.2.1)
+      actionpack (= 5.2.1)
+      actionview (= 5.2.1)
+      activejob (= 5.2.1)
+      activemodel (= 5.2.1)
+      activerecord (= 5.2.1)
+      activestorage (= 5.2.1)
+      activesupport (= 5.2.1)
+      bundler (>= 1.3.0)
+      railties (= 5.2.1)
+      sprockets-rails (>= 2.0.0)
+    rails-controller-testing (1.0.2)
+      actionpack (~> 5.x, >= 5.0.1)
+      actionview (~> 5.x, >= 5.0.1)
+      activesupport (~> 5.x)
+    rails-dom-testing (2.0.3)
+      activesupport (>= 4.2.0)
+      nokogiri (>= 1.6)
+    rails-html-sanitizer (1.0.4)
+      loofah (~> 2.2, >= 2.2.2)
+    railties (5.2.1)
+      actionpack (= 5.2.1)
+      activesupport (= 5.2.1)
+      method_source
+      rake (>= 0.8.7)
+      thor (>= 0.19.0, < 2.0)
+    rake (12.3.1)
+    rdoc (6.0.4)
+    responders (2.4.0)
+      actionpack (>= 4.2.0, < 5.3)
+      railties (>= 4.2.0, < 5.3)
+    ruby-openid (2.7.0)
+    sprockets (3.7.2)
+      concurrent-ruby (~> 1.0)
+      rack (> 1, < 3)
+    sprockets-rails (3.2.1)
+      actionpack (>= 4.0)
+      activesupport (>= 4.0)
+      sprockets (>= 3.0.0)
+    sqlite3 (1.3.13)
+    thor (0.20.0)
+    thread_safe (0.3.6)
+    timecop (0.9.1)
+    tzinfo (1.2.5)
+      thread_safe (~> 0.1)
+    warden (1.2.7)
+      rack (>= 1.0)
+    webrat (0.7.3)
+      nokogiri (>= 1.2.0)
+      rack (>= 1.0)
+      rack-test (>= 0.5.3)
+    websocket-driver (0.7.0)
+      websocket-extensions (>= 0.1.0)
+    websocket-extensions (0.1.3)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activemodel-serializers-xml!
+  devise!
+  mocha (~> 1.1)
+  omniauth
+  omniauth-facebook
+  omniauth-oauth2
+  omniauth-openid
+  rails (~> 5.2)
+  rails-controller-testing
+  rdoc
+  responders (~> 2.1)
+  sqlite3 (~> 1.3.6)
+  test_after_commit
+  timecop
+  webrat (= 0.7.3)
+
+BUNDLED WITH
+   1.17.3
--- a/gemfiles/Gemfile.rails-6.0-stable
+++ b/gemfiles/Gemfile.rails-6.0-stable
@@ -2,22 +2,24 @@ source "https://rubygems.org"

 gemspec path: ".."

-gem "rails", github: "rails/rails", branch: "main"
+gem "rails", '~> 6.0.0'
 gem "omniauth"
 gem "omniauth-oauth2"
 gem "rdoc"

-gem "rails-controller-testing", github: "rails/rails-controller-testing"
+gem "activemodel-serializers-xml", github: "rails/activemodel-serializers-xml"

-gem "responders", "~> 3.1"
+gem "rails-controller-testing"
+
+gem "responders", "~> 3.0"

 group :test do
  gem "omniauth-facebook"
  gem "omniauth-openid"
-  gem "rexml"
  gem "timecop"
  gem "webrat", "0.7.3", require: false
  gem "mocha", "~> 1.1", require: false
+  gem 'test_after_commit', require: false
 end

 platforms :ruby do
--- a/gemfiles/Gemfile.rails-6.0-stable.lock
+++ b/gemfiles/Gemfile.rails-6.0-stable.lock
@@ -0,0 +1,219 @@
+GIT
+  remote: git://github.com/rails/activemodel-serializers-xml.git
+  revision: 93689638c28525acc65afb638fce866826532641
+  specs:
+    activemodel-serializers-xml (1.0.2)
+      activemodel (>= 5.0.0.a)
+      activesupport (>= 5.0.0.a)
+      builder (~> 3.1)
+
+PATH
+  remote: ..
+  specs:
+    devise (4.7.1)
+      bcrypt (~> 3.0)
+      orm_adapter (~> 0.1)
+      railties (>= 5.0)
+      responders
+      warden (~> 1.2.3)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actioncable (6.0.0)
+      actionpack (= 6.0.0)
+      nio4r (~> 2.0)
+      websocket-driver (>= 0.6.1)
+    actionmailbox (6.0.0)
+      actionpack (= 6.0.0)
+      activejob (= 6.0.0)
+      activerecord (= 6.0.0)
+      activestorage (= 6.0.0)
+      activesupport (= 6.0.0)
+      mail (>= 2.7.1)
+    actionmailer (6.0.0)
+      actionpack (= 6.0.0)
+      actionview (= 6.0.0)
+      activejob (= 6.0.0)
+      mail (~> 2.5, >= 2.5.4)
+      rails-dom-testing (~> 2.0)
+    actionpack (6.0.0)
+      actionview (= 6.0.0)
+      activesupport (= 6.0.0)
+      rack (~> 2.0)
+      rack-test (>= 0.6.3)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.2.0)
+    actiontext (6.0.0)
+      actionpack (= 6.0.0)
+      activerecord (= 6.0.0)
+      activestorage (= 6.0.0)
+      activesupport (= 6.0.0)
+      nokogiri (>= 1.8.5)
+    actionview (6.0.0)
+      activesupport (= 6.0.0)
+      builder (~> 3.1)
+      erubi (~> 1.4)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.1, >= 1.2.0)
+    activejob (6.0.0)
+      activesupport (= 6.0.0)
+      globalid (>= 0.3.6)
+    activemodel (6.0.0)
+      activesupport (= 6.0.0)
+    activerecord (6.0.0)
+      activemodel (= 6.0.0)
+      activesupport (= 6.0.0)
+    activestorage (6.0.0)
+      actionpack (= 6.0.0)
+      activejob (= 6.0.0)
+      activerecord (= 6.0.0)
+      marcel (~> 0.3.1)
+    activesupport (6.0.0)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+      zeitwerk (~> 2.1, >= 2.1.8)
+    bcrypt (3.1.13)
+    builder (3.2.3)
+    concurrent-ruby (1.1.5)
+    crass (1.0.4)
+    erubi (1.8.0)
+    faraday (0.15.4)
+      multipart-post (>= 1.2, < 3)
+    globalid (0.4.2)
+      activesupport (>= 4.2.0)
+    hashie (3.6.0)
+    i18n (1.6.0)
+      concurrent-ruby (~> 1.0)
+    jwt (2.2.1)
+    loofah (2.2.3)
+      crass (~> 1.0.2)
+      nokogiri (>= 1.5.9)
+    mail (2.7.1)
+      mini_mime (>= 0.1.1)
+    marcel (0.3.3)
+      mimemagic (~> 0.3.2)
+    metaclass (0.0.4)
+    method_source (0.9.2)
+    mimemagic (0.3.3)
+    mini_mime (1.0.2)
+    mini_portile2 (2.4.0)
+    minitest (5.11.3)
+    mocha (1.9.0)
+      metaclass (~> 0.0.1)
+    multi_json (1.13.1)
+    multi_xml (0.6.0)
+    multipart-post (2.1.1)
+    nio4r (2.4.0)
+    nokogiri (1.10.4)
+      mini_portile2 (~> 2.4.0)
+    oauth2 (1.4.1)
+      faraday (>= 0.8, < 0.16.0)
+      jwt (>= 1.0, < 3.0)
+      multi_json (~> 1.3)
+      multi_xml (~> 0.5)
+      rack (>= 1.2, < 3)
+    omniauth (1.9.0)
+      hashie (>= 3.4.6, < 3.7.0)
+      rack (>= 1.6.2, < 3)
+    omniauth-facebook (5.0.0)
+      omniauth-oauth2 (~> 1.2)
+    omniauth-oauth2 (1.6.0)
+      oauth2 (~> 1.1)
+      omniauth (~> 1.9)
+    omniauth-openid (1.0.1)
+      omniauth (~> 1.0)
+      rack-openid (~> 1.3.1)
+    orm_adapter (0.5.0)
+    rack (2.0.7)
+    rack-openid (1.3.1)
+      rack (>= 1.1.0)
+      ruby-openid (>= 2.1.8)
+    rack-test (1.1.0)
+      rack (>= 1.0, < 3)
+    rails (6.0.0)
+      actioncable (= 6.0.0)
+      actionmailbox (= 6.0.0)
+      actionmailer (= 6.0.0)
+      actionpack (= 6.0.0)
+      actiontext (= 6.0.0)
+      actionview (= 6.0.0)
+      activejob (= 6.0.0)
+      activemodel (= 6.0.0)
+      activerecord (= 6.0.0)
+      activestorage (= 6.0.0)
+      activesupport (= 6.0.0)
+      bundler (>= 1.3.0)
+      railties (= 6.0.0)
+      sprockets-rails (>= 2.0.0)
+    rails-controller-testing (1.0.4)
+      actionpack (>= 5.0.1.x)
+      actionview (>= 5.0.1.x)
+      activesupport (>= 5.0.1.x)
+    rails-dom-testing (2.0.3)
+      activesupport (>= 4.2.0)
+      nokogiri (>= 1.6)
+    rails-html-sanitizer (1.2.0)
+      loofah (~> 2.2, >= 2.2.2)
+    railties (6.0.0)
+      actionpack (= 6.0.0)
+      activesupport (= 6.0.0)
+      method_source
+      rake (>= 0.8.7)
+      thor (>= 0.20.3, < 2.0)
+    rake (12.3.3)
+    rdoc (6.1.1)
+    responders (3.0.0)
+      actionpack (>= 5.0)
+      railties (>= 5.0)
+    ruby-openid (2.7.0)
+    sprockets (3.7.2)
+      concurrent-ruby (~> 1.0)
+      rack (> 1, < 3)
+    sprockets-rails (3.2.1)
+      actionpack (>= 4.0)
+      activesupport (>= 4.0)
+      sprockets (>= 3.0.0)
+    sqlite3 (1.4.1)
+    test_after_commit (1.1.0)
+      activerecord (>= 3.2)
+    thor (0.20.3)
+    thread_safe (0.3.6)
+    timecop (0.9.1)
+    tzinfo (1.2.5)
+      thread_safe (~> 0.1)
+    warden (1.2.8)
+      rack (>= 2.0.6)
+    webrat (0.7.3)
+      nokogiri (>= 1.2.0)
+      rack (>= 1.0)
+      rack-test (>= 0.5.3)
+    websocket-driver (0.7.1)
+      websocket-extensions (>= 0.1.0)
+    websocket-extensions (0.1.4)
+    zeitwerk (2.1.9)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activemodel-serializers-xml!
+  devise!
+  mocha (~> 1.1)
+  omniauth
+  omniauth-facebook
+  omniauth-oauth2
+  omniauth-openid
+  rails (~> 6.0.0)
+  rails-controller-testing
+  rdoc
+  responders (~> 3.0)
+  sqlite3 (~> 1.4)
+  test_after_commit
+  timecop
+  webrat (= 0.7.3)
+
+BUNDLED WITH
+   1.17.3
--- a/lib/devise.rb
+++ b/lib/devise.rb
@@ -13,7 +13,6 @@ module Devise
  autoload :Encryptor,          'devise/encryptor'
  autoload :FailureApp,         'devise/failure_app'
  autoload :OmniAuth,           'devise/omniauth'
-  autoload :Orm,                'devise/orm'
  autoload :ParameterFilter,    'devise/parameter_filter'
  autoload :ParameterSanitizer, 'devise/parameter_sanitizer'
  autoload :TestHelpers,        'devise/test_helpers'
@@ -24,7 +23,6 @@ module Devise
  module Controllers
    autoload :Helpers,        'devise/controllers/helpers'
    autoload :Rememberable,   'devise/controllers/rememberable'
-    autoload :Responder,      'devise/controllers/responder'
    autoload :ScopedViews,    'devise/controllers/scoped_views'
    autoload :SignInOut,      'devise/controllers/sign_in_out'
    autoload :StoreLocation,  'devise/controllers/store_location'
@@ -219,16 +217,7 @@ module Devise

  # Which formats should be treated as navigational.
  mattr_accessor :navigational_formats
-  @@navigational_formats = ["*/*", :html, :turbo_stream]
-
-  # The default responder used by Devise, used to customize status codes with:
-  #
-  #   `config.responder.error_status`
-  #   `config.responder.redirect_status`
-  #
-  # Can be replaced by a custom application responder.
-  mattr_accessor :responder
-  @@responder = Devise::Controllers::Responder
+  @@navigational_formats = ["*/*", :html]

  # When set to true, signing out a user signs out all other scopes.
  mattr_accessor :sign_out_all_scopes
@@ -308,6 +297,14 @@ module Devise
  mattr_accessor :sign_in_after_change_password
  @@sign_in_after_change_password = true

+  def self.rails51? # :nodoc:
+    Rails.gem_version >= Gem::Version.new("5.1.x")
+  end
+
+  def self.activerecord51? # :nodoc:
+    defined?(ActiveRecord) && ActiveRecord.gem_version >= Gem::Version.new("5.1.x")
+  end
+
  # Default way to set up Devise. Run rails generate devise_install to create
  # a fresh initializer with all configuration values.
  def self.setup
@@ -320,20 +317,12 @@ module Devise
    end

    def get
-      # TODO: Remove AS::Dependencies usage when dropping support to Rails < 7.
-      if ActiveSupport::Dependencies.respond_to?(:constantize)
-        ActiveSupport::Dependencies.constantize(@name)
-      else
-        @name.constantize
-      end
+      ActiveSupport::Dependencies.constantize(@name)
    end
  end

  def self.ref(arg)
-    # TODO: Remove AS::Dependencies usage when dropping support to Rails < 7.
-    if ActiveSupport::Dependencies.respond_to?(:reference)
-      ActiveSupport::Dependencies.reference(arg)
-    end
+    ActiveSupport::Dependencies.reference(arg)
    Getter.new(arg)
  end

@@ -513,20 +502,8 @@ module Devise

  # constant-time comparison algorithm to prevent timing attacks
  def self.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.activerecord51? # :nodoc:
-    ActiveSupport::Deprecation.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")
+    return false if a.nil? || b.nil?
+    ActiveSupport::SecurityUtils.secure_compare(a, b)
  end
 end

--- a/lib/devise/controllers/helpers.rb
+++ b/lib/devise/controllers/helpers.rb
@@ -36,14 +36,14 @@ module Devise
        #     before_action ->{ authenticate_blogger! :admin }  # Redirects to the admin login page
        #     current_blogger :user                             # Preferably returns a User if one is signed in
        #
-        def devise_group(group_name, opts = {})
+        def devise_group(group_name, opts={})
          mappings = "[#{ opts[:contains].map { |m| ":#{m}" }.join(',') }]"

          class_eval <<-METHODS, __FILE__, __LINE__ + 1
-            def authenticate_#{group_name}!(favorite = nil, opts = {})
+            def authenticate_#{group_name}!(favourite=nil, opts={})
              unless #{group_name}_signed_in?
                mappings = #{mappings}
-                mappings.unshift mappings.delete(favorite.to_sym) if favorite
+                mappings.unshift mappings.delete(favourite.to_sym) if favourite
                mappings.each do |mapping|
                  opts[:scope] = mapping
                  warden.authenticate!(opts) if !devise_controller? || opts.delete(:force)
@@ -53,13 +53,13 @@ module Devise

            def #{group_name}_signed_in?
              #{mappings}.any? do |mapping|
-                warden.authenticate?(scope: mapping)
+                warden.authenticated?(scope: mapping)
              end
            end

-            def current_#{group_name}(favorite = nil)
+            def current_#{group_name}(favourite=nil)
              mappings = #{mappings}
-              mappings.unshift mappings.delete(favorite.to_sym) if favorite
+              mappings.unshift mappings.delete(favourite.to_sym) if favourite
              mappings.each do |mapping|
                current = warden.authenticate(scope: mapping)
                return current if current
@@ -113,13 +113,13 @@ module Devise
        mapping = mapping.name

        class_eval <<-METHODS, __FILE__, __LINE__ + 1
-          def authenticate_#{mapping}!(opts = {})
+          def authenticate_#{mapping}!(opts={})
            opts[:scope] = :#{mapping}
            warden.authenticate!(opts) if !devise_controller? || opts.delete(:force)
          end

          def #{mapping}_signed_in?
-            !!current_#{mapping}
+            !!(@current_#{mapping} || warden.authenticated?(scope: :#{mapping}))
          end

          def current_#{mapping}
@@ -252,7 +252,7 @@ module Devise
      # Overwrite Rails' handle unverified request to sign out all scopes,
      # clear run strategies and remove cached variables.
      def handle_unverified_request
-        super # call the default behavior which resets/nullifies/raises
+        super # call the default behaviour which resets/nullifies/raises
        request.env["devise.skip_storage"] = true
        sign_out_all_scopes(false)
      end
--- a/lib/devise/controllers/responder.rb
+++ b/lib/devise/controllers/responder.rb
@@ -1,35 +0,0 @@
-# frozen_string_literal: true
-
-module Devise
-  module Controllers
-    # Custom Responder to configure default statuses that only apply to Devise,
-    # and allow to integrate more easily with Hotwire/Turbo.
-    class Responder < ActionController::Responder
-      if respond_to?(:error_status=) && respond_to?(:redirect_status=)
-        self.error_status = :ok
-        self.redirect_status = :found
-      else
-        # TODO: remove this support for older Rails versions, which aren't supported by Turbo
-        # and/or responders. It won't allow configuring a custom response, but it allows Devise
-        # to use these methods and defaults across the implementation more easily.
-        def self.error_status
-          :ok
-        end
-
-        def self.redirect_status
-          :found
-        end
-
-        def self.error_status=(*)
-          warn "[DEVISE] Setting the error status on the Devise responder has no effect with this " \
-            "version of `responders`, please make sure you're using a newer version. Check the changelog for more info."
-        end
-
-        def self.redirect_status=(*)
-          warn "[DEVISE] Setting the redirect status on the Devise responder has no effect with this " \
-            "version of `responders`, please make sure you're using a newer version. Check the changelog for more info."
-        end
-      end
-    end
-  end
-end
--- a/lib/devise/controllers/sign_in_out.rb
+++ b/lib/devise/controllers/sign_in_out.rb
@@ -10,9 +10,9 @@ module Devise
      # cause exceptions to be thrown from this method; if you simply want to check
      # if a scope has already previously been authenticated without running
      # authentication hooks, you can directly call `warden.authenticated?(scope: scope)`
-      def signed_in?(scope = nil)
+      def signed_in?(scope=nil)
        [scope || Devise.mappings.keys].flatten.any? do |_scope|
-          warden.authenticate?(scope: _scope)
+          warden.authenticated?(scope: _scope)
        end
      end

@@ -21,7 +21,7 @@ module Devise
      # to the set_user method in warden.
      # If you are using a custom warden strategy and the timeoutable module, you have to
      # set `env["devise.skip_timeout"] = true` in the request to use this method, like we do
-      # in the sessions controller: https://github.com/heartcombo/devise/blob/main/app/controllers/devise/sessions_controller.rb#L7
+      # in the sessions controller: https://github.com/plataformatec/devise/blob/master/app/controllers/devise/sessions_controller.rb#L7
      #
      # Examples:
      #
@@ -51,6 +51,7 @@ module Devise
          true
        else
          warden.set_user(resource, options.merge!(scope: scope))
+          resource.update_tracked_fields!(warden.request) if resource.respond_to?(:update_tracked_fields!)
        end
      end

@@ -77,7 +78,7 @@ module Devise
      #   sign_out :user     # sign_out(scope)
      #   sign_out @user     # sign_out(resource)
      #
-      def sign_out(resource_or_scope = nil)
+      def sign_out(resource_or_scope=nil)
        return sign_out_all_scopes unless resource_or_scope
        scope = Devise::Mapping.find_scope!(resource_or_scope)
        user = warden.user(scope: scope, run_callbacks: false) # If there is no user
@@ -92,7 +93,7 @@ module Devise
      # Sign out all active users or scopes. This helper is useful for signing out all roles
      # in one click. This signs out ALL scopes in warden. Returns true if there was at least one logout
      # and false if there was no user logged in on all scopes.
-      def sign_out_all_scopes(lock = true)
+      def sign_out_all_scopes(lock=true)
        users = Devise.mappings.keys.map { |s| warden.user(scope: s, run_callbacks: false) }

        warden.logout
@@ -106,12 +107,10 @@ 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/controllers/url_helpers.rb
+++ b/lib/devise/controllers/url_helpers.rb
@@ -34,7 +34,7 @@ module Devise
        end
      end

-      def self.generate_helpers!(routes = nil)
+      def self.generate_helpers!(routes=nil)
        routes ||= begin
          mappings = Devise.mappings.values.map(&:used_helpers).flatten.uniq
          Devise::URL_HELPERS.slice(*mappings)
--- a/lib/devise/failure_app.rb
+++ b/lib/devise/failure_app.rb
@@ -71,11 +71,8 @@ module Devise
      end

      flash.now[:alert] = i18n_message(:invalid) if is_flashing_format?
-      self.response = recall_app(warden_options[:recall]).call(request.env).tap { |response|
-        response[0] = Rack::Utils.status_code(
-          response[0].in?(300..399) ? Devise.responder.redirect_status : Devise.responder.error_status
-        )
-      }
+      # self.response = recall_app(warden_options[:recall]).call(env)
+      self.response = recall_app(warden_options[:recall]).call(request.env)
    end

    def redirect
@@ -106,11 +103,14 @@ module Devise
        options[:scope] = "devise.failure"
        options[:default] = [message]
        auth_keys = scope_class.authentication_keys
-        keys = (auth_keys.respond_to?(:keys) ? auth_keys.keys : auth_keys).map { |key| scope_class.human_attribute_name(key) }
+        keys = (auth_keys.respond_to?(:keys) ? auth_keys.keys : auth_keys).map { |key| scope_class.human_attribute_name(key).downcase }
        options[:authentication_keys] = keys.join(I18n.translate(:"support.array.words_connector"))
        options = i18n_options(options)
+        translated_message = I18n.t(:"#{scope}.#{message}", options)

-        I18n.t(:"#{scope}.#{message}", **options)
+        # only call `#humanize` when the message is `:invalid` to ensure the original format
+        # of other messages - like `:does_not_exist` - is kept.
+        message == :invalid ? translated_message.humanize : translated_message
      else
        message.to_s
      end
@@ -155,7 +155,7 @@ module Devise

      # 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.
+      # that use Devise. Remove it when the support of Rails 5.0 is droped.
      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
@@ -171,7 +171,7 @@ module Devise
    end

    def skip_format?
-      %w(html */* turbo_stream).include? request_format.to_s
+      %w(html */*).include? request_format.to_s
    end

    # Choose whether we should respond in an HTTP authentication fashion,
--- a/lib/devise/hooks/csrf_cleaner.rb
+++ b/lib/devise/hooks/csrf_cleaner.rb
@@ -4,11 +4,6 @@ Warden::Manager.after_authentication do |record, warden, options|
  clean_up_for_winning_strategy = !warden.winning_strategy.respond_to?(:clean_up_csrf?) ||
    warden.winning_strategy.clean_up_csrf?
  if Devise.clean_up_csrf_token_on_authentication && clean_up_for_winning_strategy
-    if warden.request.respond_to?(:reset_csrf_token)
-      # Rails 7.1+
-      warden.request.reset_csrf_token
-    else
-      warden.request.session.try(:delete, :_csrf_token)
-    end
+    warden.request.session.try(:delete, :_csrf_token)
  end
 end
--- a/lib/devise/hooks/lockable.rb
+++ b/lib/devise/hooks/lockable.rb
@@ -3,7 +3,10 @@
 # After each sign in, if resource responds to failed_attempts, sets it to 0
 # This is only triggered when the user is explicitly set (with set_user)
 Warden::Manager.after_set_user except: :fetch do |record, warden, options|
-  if record.respond_to?(:reset_failed_attempts!) && warden.authenticated?(options[:scope])
-    record.reset_failed_attempts!
+  if record.respond_to?(:failed_attempts) && warden.authenticated?(options[:scope])
+    unless record.failed_attempts.to_i.zero?
+      record.failed_attempts = 0
+      record.save(validate: false)
+    end
  end
 end
--- a/lib/devise/hooks/timeoutable.rb
+++ b/lib/devise/hooks/timeoutable.rb
@@ -21,8 +21,8 @@ Warden::Manager.after_set_user do |record, warden, options|

    proxy = Devise::Hooks::Proxy.new(warden)

-    if !env['devise.skip_timeout'] &&
-        record.timedout?(last_request_at) &&
+    if record.timedout?(last_request_at) &&
+        !env['devise.skip_timeout'] &&
        !proxy.remember_me_is_active?(record)
      Devise.sign_out_all_scopes ? proxy.sign_out : proxy.sign_out(scope)
      throw :warden, scope: scope, message: :timeout
--- a/lib/devise/hooks/trackable.rb
+++ b/lib/devise/hooks/trackable.rb
@@ -1,11 +0,0 @@
-# frozen_string_literal: true
-
-# After each sign in, update sign in time, sign in count and sign in IP.
-# This is only triggered when the user is explicitly set (with set_user)
-# and on authentication. Retrieving the user from session (:fetch) does
-# not trigger it.
-Warden::Manager.after_set_user except: :fetch do |record, warden, options|
-  if record.respond_to?(:update_tracked_fields!) && warden.authenticated?(options[:scope]) && !warden.request.env['devise.skip_trackable']
-    record.update_tracked_fields!(warden.request)
-  end
-end
--- a/lib/devise/mapping.rb
+++ b/lib/devise/mapping.rb
@@ -46,7 +46,7 @@ module Devise
      raise "Could not find a valid mapping for #{obj.inspect}"
    end

-    def self.find_by_path!(path, path_type = :fullpath)
+    def self.find_by_path!(path, path_type=:fullpath)
      Devise.mappings.each_value { |m| return m if path.include?(m.send(path_type)) }
      raise "Could not find a valid mapping for path #{path.inspect}"
    end
--- a/lib/devise/models.rb
+++ b/lib/devise/models.rb
@@ -84,7 +84,6 @@ module Devise
      end

      devise_modules_hook! do
-        include Devise::Orm
        include Devise::Models::Authenticatable

        selected_modules.each do |m|
--- a/lib/devise/models/authenticatable.rb
+++ b/lib/devise/models/authenticatable.rb
@@ -2,7 +2,6 @@

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

 module Devise
  module Models
@@ -10,7 +9,7 @@ module Devise
    #
    # == Options
    #
-    # Authenticatable adds the following options to +devise+:
+    # Authenticatable adds the following options to devise_for:
    #
    #   * +authentication_keys+: parameters used for authentication. By default [:email].
    #
@@ -56,14 +55,11 @@ module Devise
    module Authenticatable
      extend ActiveSupport::Concern

-      UNSAFE_ATTRIBUTES_FOR_SERIALIZATION = [:encrypted_password, :reset_password_token, :reset_password_sent_at,
+      BLACKLIST_FOR_SERIALIZATION = [:encrypted_password, :reset_password_token, :reset_password_sent_at,
        :remember_created_at, :sign_in_count, :current_sign_in_at, :last_sign_in_at, :current_sign_in_ip,
        :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"
-
      included do
        class_attribute :devise_modules, instance_writer: false
        self.devise_modules ||= []
@@ -108,12 +104,12 @@ module Devise
      # given to :except will simply add names to exempt to Devise internal list.
      def serializable_hash(options = nil)
        options = options.try(:dup) || {}
-        options[:except] = Array(options[:except]).dup
+        options[:except] = Array(options[:except])

        if options[:force_except]
          options[:except].concat Array(options[:force_except])
        else
-          options[:except].concat UNSAFE_ATTRIBUTES_FOR_SERIALIZATION
+          options[:except].concat BLACKLIST_FOR_SERIALIZATION
        end

        super(options)
@@ -156,8 +152,7 @@ module Devise
      #         # If the record is new or changed then delay the
      #         # delivery until the after_commit callback otherwise
      #         # send now because after_commit will not be called.
-      #         # For Rails < 6 use `changed?` instead of `saved_changes?`.
-      #         if new_record? || saved_changes?
+      #         if new_record? || changed?
      #           pending_devise_notifications << [notification, args]
      #         else
      #           render_and_send_devise_message(notification, *args)
@@ -187,11 +182,8 @@ module Devise
      #         # Deliver later with Active Job's `deliver_later`
      #         if message.respond_to?(:deliver_later)
      #           message.deliver_later
-      #         # 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
+      #           message.deliver_now
      #         end
      #       end
      #
@@ -199,12 +191,7 @@ module Devise
      #
      def send_devise_notification(notification, *args)
        message = devise_mailer.send(notification, self, *args)
-        # Remove once we move to Rails 4.2+ only.
-        if message.respond_to?(:deliver_now)
-          message.deliver_now
-        else
-          message.deliver
-        end
+        message.deliver_now
      end

      def downcase_keys
@@ -276,17 +263,17 @@ module Devise
          find_first_by_auth_conditions(tainted_conditions)
        end

-        def find_first_by_auth_conditions(tainted_conditions, opts = {})
+        def find_first_by_auth_conditions(tainted_conditions, opts={})
          to_adapter.find_first(devise_parameter_filter.filter(tainted_conditions).merge(opts))
        end

        # Find or initialize a record setting an error if it can't be found.
-        def find_or_initialize_with_error_by(attribute, value, error = :invalid) #:nodoc:
+        def find_or_initialize_with_error_by(attribute, value, error=:invalid) #:nodoc:
          find_or_initialize_with_errors([attribute], { attribute => value }, error)
        end

        # Find or initialize a record with group of attributes based on a list of required attributes.
-        def find_or_initialize_with_errors(required_attributes, attributes, error = :invalid) #:nodoc:
+        def find_or_initialize_with_errors(required_attributes, attributes, error=:invalid) #:nodoc:
          attributes.try(:permit!)
          attributes = attributes.to_h.with_indifferent_access
                                 .slice(*required_attributes)
--- a/lib/devise/models/confirmable.rb
+++ b/lib/devise/models/confirmable.rb
@@ -48,7 +48,7 @@ module Devise
      included do
        before_create :generate_confirmation_token, if: :confirmation_required?
        after_create :skip_reconfirmation_in_callback!, if: :send_confirmation_notification?
-        if Devise::Orm.active_record?(self) # ActiveRecord
+        if defined?(ActiveRecord) && self < ActiveRecord::Base # ActiveRecord
          after_commit :send_on_create_confirmation_instructions, on: :create, if: :send_confirmation_notification?
          after_commit :send_reconfirmation_instructions, on: :update, if: :reconfirmation_required?
        else # Mongoid
@@ -76,7 +76,7 @@ module Devise
      # Confirm a user by setting it's confirmed_at to actual time. If the user
      # is already confirmed, add an error to email field. If the user is invalid
      # add errors
-      def confirm(args = {})
+      def confirm(args={})
        pending_any_confirmation do
          if confirmation_period_expired?
            self.errors.add(:email, :confirmation_period_expired,
@@ -258,23 +258,44 @@ module Devise
          generate_confirmation_token && save(validate: false)
        end

-
-        def postpone_email_change_until_confirmation_and_regenerate_confirmation_token
-          @reconfirmation_required = true
-          self.unconfirmed_email = self.email
-          self.email = self.devise_email_in_database
-          self.confirmation_token = nil
-          generate_confirmation_token
+        if Devise.activerecord51?
+          def postpone_email_change_until_confirmation_and_regenerate_confirmation_token
+            @reconfirmation_required = true
+            self.unconfirmed_email = self.email
+            self.email = self.email_in_database
+            self.confirmation_token = nil
+            generate_confirmation_token
+          end
+        else
+          def postpone_email_change_until_confirmation_and_regenerate_confirmation_token
+            @reconfirmation_required = true
+            self.unconfirmed_email = self.email
+            self.email = self.email_was
+            self.confirmation_token = nil
+            generate_confirmation_token
+          end
        end

-        def postpone_email_change?
-          postpone = self.class.reconfirmable &&
-            devise_will_save_change_to_email? &&
-            !@bypass_confirmation_postpone &&
-            self.email.present? &&
-            (!@skip_reconfirmation_in_callback || !self.devise_email_in_database.nil?)
-          @bypass_confirmation_postpone = false
-          postpone
+        if Devise.activerecord51?
+          def postpone_email_change?
+            postpone = self.class.reconfirmable &&
+              will_save_change_to_email? &&
+              !@bypass_confirmation_postpone &&
+              self.email.present? &&
+              (!@skip_reconfirmation_in_callback || !self.email_in_database.nil?)
+            @bypass_confirmation_postpone = false
+            postpone
+          end
+        else
+          def postpone_email_change?
+            postpone = self.class.reconfirmable &&
+              email_changed? &&
+              !@bypass_confirmation_postpone &&
+              self.email.present? &&
+              (!@skip_reconfirmation_in_callback || !self.email_was.nil?)
+            @bypass_confirmation_postpone = false
+            postpone
+          end
        end

        def reconfirmation_required?
@@ -313,7 +334,7 @@ module Devise
        # confirmation instructions to it. If not, try searching for a user by unconfirmed_email
        # field. If no user is found, returns a new user with an email not found error.
        # Options must contain the user email
-        def send_confirmation_instructions(attributes = {})
+        def send_confirmation_instructions(attributes={})
          confirmable = find_by_unconfirmed_email_with_errors(attributes) if reconfirmable
          unless confirmable.try(:persisted?)
            confirmable = find_or_initialize_with_errors(confirmation_keys, attributes, :not_found)
--- a/lib/devise/models/database_authenticatable.rb
+++ b/lib/devise/models/database_authenticatable.rb
@@ -7,13 +7,9 @@ module Devise
    # Authenticatable Module, responsible for hashing the password and
    # validating the authenticity of a user while signing in.
    #
-    # This module defines a `password=` method. This method will hash the argument
-    # and store it in the `encrypted_password` column, bypassing any pre-existing
-    # `password` column if it exists.
-    #
    # == Options
    #
-    # DatabaseAuthenticatable adds the following options to +devise+:
+    # DatabaseAuthenticatable adds the following options to devise_for:
    #
    #   * +pepper+: a random string used to provide a more secure hash. Use
    #     `rails secret` to generate new keys.
@@ -42,7 +38,7 @@ module Devise
      def initialize(*args, &block)
        @skip_email_changed_notification = false
        @skip_password_change_notification = false
-        super
+        super 
      end

      # Skips sending the email changed notification after_update
@@ -84,16 +80,7 @@ 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, *options)
-        if options.present?
-          ActiveSupport::Deprecation.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
-
+      def update_with_password(params)
        current_password = params.delete(:current_password)

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

        result = if valid_password?(current_password)
-          update(params, *options)
+          update(params)
        else
-          assign_attributes(params, *options)
+          assign_attributes(params)
          valid?
          errors.add(:current_password, current_password.blank? ? :blank : :invalid)
          false
@@ -126,20 +113,11 @@ module Devise
      #     super(params)
      #   end
      #
-      def update_without_password(params, *options)
-        if options.present?
-          ActiveSupport::Deprecation.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
-
+      def update_without_password(params)
        params.delete(:password)
        params.delete(:password_confirmation)

-        result = update(params, *options)
+        result = update(params)
        clean_up_passwords
        result
      end
@@ -177,9 +155,16 @@ module Devise
        encrypted_password[0,29] if encrypted_password
      end

-      # Send notification to user when email changes.
-      def send_email_changed_notification
-        send_devise_notification(:email_changed, to: devise_email_before_last_save)
+      if Devise.activerecord51?
+        # Send notification to user when email changes.
+        def send_email_changed_notification
+          send_devise_notification(:email_changed, to: email_before_last_save)
+        end
+      else
+        # Send notification to user when email changes.
+        def send_email_changed_notification
+          send_devise_notification(:email_changed, to: email_was)
+        end
      end

      # Send notification to user when password changes.
@@ -192,18 +177,30 @@ module Devise
      # Hashes the password using bcrypt. Custom hash functions should override
      # this method to apply their own algorithm.
      #
-      # See https://github.com/heartcombo/devise-encryptable for examples
+      # See https://github.com/plataformatec/devise-encryptable for examples
      # of other hashing engines.
      def password_digest(password)
        Devise::Encryptor.digest(self.class, password)
      end

-      def send_email_changed_notification?
-        self.class.send_email_changed_notification && devise_saved_change_to_email? && !@skip_email_changed_notification
+      if Devise.activerecord51?
+        def send_email_changed_notification?
+          self.class.send_email_changed_notification && saved_change_to_email? && !@skip_email_changed_notification
+        end
+      else
+        def send_email_changed_notification?
+          self.class.send_email_changed_notification && email_changed? && !@skip_email_changed_notification
+        end
      end

-      def send_password_change_notification?
-        self.class.send_password_change_notification && devise_saved_change_to_encrypted_password? && !@skip_password_change_notification
+      if Devise.activerecord51?
+        def send_password_change_notification?
+          self.class.send_password_change_notification && saved_change_to_encrypted_password? && !@skip_password_change_notification
+        end
+      else
+        def send_password_change_notification?
+          self.class.send_password_change_notification && encrypted_password_changed? && !@skip_password_change_notification
+        end
      end

      module ClassMethods
--- a/lib/devise/models/lockable.rb
+++ b/lib/devise/models/lockable.rb
@@ -18,7 +18,7 @@ module Devise
    #   * +maximum_attempts+: how many attempts should be accepted before blocking the user.
    #   * +lock_strategy+: lock the user account by :failed_attempts or :none.
    #   * +unlock_strategy+: unlock the user account by :time, :email, :both or :none.
-    #   * +unlock_in+: the time you want to unlock the user after lock happens. Only available when unlock_strategy is :time or :both.
+    #   * +unlock_in+: the time you want to lock the user after to lock happens. Only available when unlock_strategy is :time or :both.
    #   * +unlock_keys+: the keys you want to use when locking and unlocking an account
    #
    module Lockable
@@ -57,14 +57,6 @@ module Devise
        save(validate: false)
      end

-      # Resets failed attempts counter to 0.
-      def reset_failed_attempts!
-        if respond_to?(:failed_attempts) && !failed_attempts.to_i.zero?
-          self.failed_attempts = 0
-          save(validate: false)
-        end
-      end
-
      # Verifies whether a user is locked or not.
      def access_locked?
        !!locked_at && !lock_expired?
@@ -118,7 +110,7 @@ module Devise
          false
        end
      end
-
+      
      def increment_failed_attempts
        self.class.increment_counter(:failed_attempts, id)
        reload
@@ -130,7 +122,15 @@ module Devise
        if Devise.paranoid
          super
        elsif access_locked? || (lock_strategy_enabled?(:failed_attempts) && attempts_exceeded?)
-          :locked
+          if unlock_strategy_enabled?(:both)
+            'locked.both'.to_sym
+          elsif unlock_strategy_enabled?(:email)
+            'locked.email'.to_sym
+          elsif unlock_strategy_enabled?(:time)
+            'locked.time'.to_sym
+          else
+            'locked.none'.to_sym
+          end
        elsif lock_strategy_enabled?(:failed_attempts) && last_attempt? && self.class.last_attempt_warning
          :last_attempt
        else
@@ -176,7 +176,7 @@ module Devise
        # unlock instructions to it. If not user is found, returns a new user
        # with an email not found error.
        # Options must contain the user's unlock keys
-        def send_unlock_instructions(attributes = {})
+        def send_unlock_instructions(attributes={})
          lockable = find_or_initialize_with_errors(unlock_keys, attributes, :not_found)
          lockable.resend_unlock_instructions if lockable.persisted?
          lockable
--- a/lib/devise/models/omniauthable.rb
+++ b/lib/devise/models/omniauthable.rb
@@ -8,11 +8,11 @@ module Devise
    #
    # == Options
    #
-    # Oauthable adds the following options to +devise+:
+    # Oauthable adds the following options to devise_for:
    #
    #   * +omniauth_providers+: Which providers are available to this model. It expects an array:
    #
-    #       devise :database_authenticatable, :omniauthable, omniauth_providers: [:twitter]
+    #       devise_for :database_authenticatable, :omniauthable, omniauth_providers: [:twitter]
    #
    module Omniauthable
      extend ActiveSupport::Concern
--- a/lib/devise/models/recoverable.rb
+++ b/lib/devise/models/recoverable.rb
@@ -7,7 +7,7 @@ module Devise
    #
    # ==Options
    #
-    # Recoverable adds the following options to +devise+:
+    # Recoverable adds the following options to devise_for:
    #
    #   * +reset_password_keys+: the keys you want to use when recovering the password for an account
    #   * +reset_password_within+: the time period within which the password must be reset or the token expires.
@@ -99,13 +99,24 @@ module Devise
          send_devise_notification(:reset_password_instructions, token, {})
        end

-        def clear_reset_password_token?
-          encrypted_password_changed = devise_respond_to_and_will_save_change_to_attribute?(:encrypted_password)
-          authentication_keys_changed = self.class.authentication_keys.any? do |attribute|
-            devise_respond_to_and_will_save_change_to_attribute?(attribute)
-          end
+        if Devise.activerecord51?
+          def clear_reset_password_token?
+            encrypted_password_changed = respond_to?(:will_save_change_to_encrypted_password?) && will_save_change_to_encrypted_password?
+            authentication_keys_changed = self.class.authentication_keys.any? do |attribute|
+              respond_to?("will_save_change_to_#{attribute}?") && send("will_save_change_to_#{attribute}?")
+            end

-          authentication_keys_changed || encrypted_password_changed
+            authentication_keys_changed || encrypted_password_changed
+          end
+        else
+          def clear_reset_password_token?
+            encrypted_password_changed = respond_to?(:encrypted_password_changed?) && encrypted_password_changed?
+            authentication_keys_changed = self.class.authentication_keys.any? do |attribute|
+              respond_to?("#{attribute}_changed?") && send("#{attribute}_changed?")
+            end
+
+            authentication_keys_changed || encrypted_password_changed
+          end
        end

      module ClassMethods
@@ -120,7 +131,7 @@ module Devise
        # password instructions to it. If user is not found, returns a new user
        # with an email not found error.
        # Attributes must contain the user's email
-        def send_reset_password_instructions(attributes = {})
+        def send_reset_password_instructions(attributes={})
          recoverable = find_or_initialize_with_errors(reset_password_keys, attributes, :not_found)
          recoverable.send_reset_password_instructions if recoverable.persisted?
          recoverable
@@ -131,7 +142,7 @@ module Devise
        # try saving the record. If not user is found, returns a new user
        # containing an error in reset_password_token attribute.
        # Attributes must contain reset_password_token, password and confirmation
-        def reset_password_by_token(attributes = {})
+        def reset_password_by_token(attributes={})
          original_token       = attributes[:reset_password_token]
          reset_password_token = Devise.token_generator.digest(self, :reset_password_token, original_token)

--- a/lib/devise/models/rememberable.rb
+++ b/lib/devise/models/rememberable.rb
@@ -15,7 +15,7 @@ module Devise
    #
    # == Options
    #
-    # Rememberable adds the following options to +devise+:
+    # Rememberable adds the following options in devise_for:
    #
    #   * +remember_for+: the time you want the user will be remembered without
    #     asking for credentials. After this time the user will be blocked and
@@ -102,7 +102,7 @@ module Devise

      def remember_me?(token, generated_at)
        # TODO: Normalize the JSON type coercion along with the Timeoutable hook
-        # in a single place https://github.com/heartcombo/devise/blob/ffe9d6d406e79108cf32a2c6a1d0b3828849c40b/lib/devise/hooks/timeoutable.rb#L14-L18
+        # in a single place https://github.com/plataformatec/devise/blob/ffe9d6d406e79108cf32a2c6a1d0b3828849c40b/lib/devise/hooks/timeoutable.rb#L14-L18
        if generated_at.is_a?(String)
          generated_at = time_from_json(generated_at)
        end
--- a/lib/devise/models/timeoutable.rb
+++ b/lib/devise/models/timeoutable.rb
@@ -11,7 +11,7 @@ module Devise
    #
    # == Options
    #
-    # Timeoutable adds the following options to +devise+:
+    # Timeoutable adds the following options to devise_for:
    #
    #   * +timeout_in+: the interval to timeout the user session without activity.
    #
--- a/lib/devise/models/trackable.rb
+++ b/lib/devise/models/trackable.rb
@@ -1,7 +1,5 @@
 # frozen_string_literal: true

-require 'devise/hooks/trackable'
-
 module Devise
  module Models
    # Track information about your user sign in. It tracks the following columns:
@@ -33,9 +31,11 @@ module Devise
      def update_tracked_fields!(request)
        # We have to check if the user is already persisted before running
        # `save` here because invalid users can be saved if we don't.
-        # See https://github.com/heartcombo/devise/issues/4673 for more details.
+        # See https://github.com/plataformatec/devise/issues/4673 for more details.
        return if new_record?

+        return if skip_trackable_and_not_active_for_authentication?(request)
+
        update_tracked_fields(request)
        save(validate: false)
      end
@@ -46,6 +46,11 @@ module Devise
        request.remote_ip
      end

+      private
+
+      def skip_trackable_and_not_active_for_authentication?(request)
+        request.env['devise.skip_trackable'] || !active_for_authentication?
+      end
    end
  end
 end
--- a/lib/devise/models/validatable.rb
+++ b/lib/devise/models/validatable.rb
@@ -9,7 +9,7 @@ module Devise
    #
    # == Options
    #
-    # Validatable adds the following options to +devise+:
+    # Validatable adds the following options to devise_for:
    #
    #   * +email_regexp+: the regular expression used to validate e-mails;
    #   * +password_length+: a range expressing password length. Defaults to 6..128.
@@ -29,8 +29,13 @@ module Devise

        base.class_eval do
          validates_presence_of   :email, if: :email_required?
-          validates_uniqueness_of :email, allow_blank: true, case_sensitive: true, if: :devise_will_save_change_to_email?
-          validates_format_of     :email, with: email_regexp, allow_blank: true, if: :devise_will_save_change_to_email?
+          if Devise.activerecord51?
+            validates_uniqueness_of :email, allow_blank: true, case_sensitive: true, if: :will_save_change_to_email?
+            validates_format_of     :email, with: email_regexp, allow_blank: true, if: :will_save_change_to_email?
+          else
+            validates_uniqueness_of :email, allow_blank: true, if: :email_changed?
+            validates_format_of     :email, with: email_regexp, allow_blank: true, if: :email_changed?
+          end

          validates_presence_of     :password, if: :password_required?
          validates_confirmation_of :password, if: :password_required?
@@ -42,7 +47,7 @@ module Devise
        unavailable_validations = VALIDATIONS.select { |v| !base.respond_to?(v) }

        unless unavailable_validations.empty?
-          raise "Could not use :validatable module since #{base} does not respond " \
+          raise "Could not use :validatable module since #{base} does not respond " <<
                "to the following methods: #{unavailable_validations.to_sentence}."
        end
      end
--- a/lib/devise/omniauth.rb
+++ b/lib/devise/omniauth.rb
@@ -1,14 +1,17 @@
 # frozen_string_literal: true

 begin
-  gem "omniauth", ">= 1.0.0"
-
  require "omniauth"
+  require "omniauth/version"
 rescue LoadError
  warn "Could not load 'omniauth'. Please ensure you have the omniauth gem >= 1.0.0 installed and listed in your Gemfile."
  raise
 end

+unless OmniAuth::VERSION =~ /^1\./
+  raise "You are using an old OmniAuth version, please ensure you have 1.0.0.pr2 version or later installed."
+end
+
 # Clean up the default path_prefix. It will be automatically set by Devise.
 OmniAuth.config.path_prefix = nil

--- a/lib/devise/orm.rb
+++ b/lib/devise/orm.rb
@@ -1,71 +0,0 @@
-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_51?(model)
-        model.include DirtyTrackingNewMethods
-      else
-        model.include DirtyTrackingOldMethods
-      end
-    end
-
-    module DirtyTrackingNewMethods
-      def devise_email_before_last_save
-        email_before_last_save
-      end
-
-      def devise_email_in_database
-        email_in_database
-      end
-
-      def devise_saved_change_to_email?
-        saved_change_to_email?
-      end
-
-      def devise_saved_change_to_encrypted_password?
-        saved_change_to_encrypted_password?
-      end
-
-      def devise_will_save_change_to_email?
-        will_save_change_to_email?
-      end
-
-      def devise_respond_to_and_will_save_change_to_attribute?(attribute)
-        respond_to?("will_save_change_to_#{attribute}?") && send("will_save_change_to_#{attribute}?")
-      end
-    end
-
-    module DirtyTrackingOldMethods
-      def devise_email_before_last_save
-        email_was
-      end
-
-      def devise_email_in_database
-        email_was
-      end
-
-      def devise_saved_change_to_email?
-        email_changed?
-      end
-
-      def devise_saved_change_to_encrypted_password?
-        encrypted_password_changed?
-      end
-
-      def devise_will_save_change_to_email?
-        email_changed?
-      end
-
-      def devise_respond_to_and_will_save_change_to_attribute?(attribute)
-        respond_to?("#{attribute}_changed?") && send("#{attribute}_changed?")
-      end
-    end
-  end
-end
--- a/lib/devise/parameter_sanitizer.rb
+++ b/lib/devise/parameter_sanitizer.rb
@@ -130,8 +130,7 @@ module Devise
    #
    # Returns an +ActiveSupport::HashWithIndifferentAccess+.
    def cast_to_hash(params)
-      # TODO: Remove the `with_indifferent_access` method call when we only support Rails 5+.
-      params && params.to_h.with_indifferent_access
+      params && params.to_h
    end

    def default_params
--- a/lib/devise/rails/deprecated_constant_accessor.rb
+++ b/lib/devise/rails/deprecated_constant_accessor.rb
@@ -1,39 +0,0 @@
-# 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: ActiveSupport::Deprecation.instance)
-            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
@@ -287,7 +287,7 @@ module ActionDispatch::Routing
    #     root to: "admin/dashboard#show", as: :user_root
    #   end
    #
-    def authenticate(scope = nil, block = nil)
+    def authenticate(scope=nil, block=nil)
      constraints_for(:authenticate!, scope, block) do
        yield
      end
@@ -311,7 +311,7 @@ module ActionDispatch::Routing
    #
    #   root to: 'landing#show'
    #
-    def authenticated(scope = nil, block = nil)
+    def authenticated(scope=nil, block=nil)
      constraints_for(:authenticate?, scope, block) do
        yield
      end
@@ -328,7 +328,7 @@ module ActionDispatch::Routing
    #
    #   root to: 'dashboard#show'
    #
-    def unauthenticated(scope = nil)
+    def unauthenticated(scope=nil)
      constraint = lambda do |request|
        not request.env["warden"].authenticate? scope: scope
      end
@@ -474,7 +474,7 @@ ERROR
        @scope = current_scope
      end

-      def constraints_for(method_to_apply, scope = nil, block = nil)
+      def constraints_for(method_to_apply, scope=nil, block=nil)
        constraint = lambda do |request|
          request.env['warden'].send(method_to_apply, scope: scope) &&
            (block.nil? || block.call(request.env["warden"].user(scope)))
--- a/lib/devise/strategies/database_authenticatable.rb
+++ b/lib/devise/strategies/database_authenticatable.rb
@@ -12,6 +12,7 @@ module Devise

        if validate(resource){ hashed = true; resource.valid_password?(password) }
          remember_me(resource)
+          resource.update_tracked_fields!(request) if resource.respond_to?(:update_tracked_fields!)
          resource.after_database_authentication
          success!(resource)
        end
--- a/lib/devise/test/controller_helpers.rb
+++ b/lib/devise/test/controller_helpers.rb
@@ -37,8 +37,6 @@ module Devise
        @response
      end

-      ruby2_keywords(:process) if respond_to?(:ruby2_keywords, true)
-
      # We need to set up the environment variables and the response in the controller.
      def setup_controller_for_warden #:nodoc:
        @request.env['action_controller.instance'] = @controller
@@ -141,9 +139,8 @@ 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
+          @controller.response.body = response.body
          nil # causes process return @response
        end

--- a/lib/devise/test/integration_helpers.rb
+++ b/lib/devise/test/integration_helpers.rb
@@ -28,7 +28,7 @@ module Devise
        end
      end

-      # Signs in a specific resource, mimicking a successful sign in
+      # Signs in a specific resource, mimicking a successfull sign in
      # operation through +Devise::SessionsController#create+.
      #
      # * +resource+ - The resource that should be authenticated
--- a/lib/devise/version.rb
+++ b/lib/devise/version.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: true

 module Devise
-  VERSION = "4.9.2".freeze
+  VERSION = "4.7.1".freeze
 end
--- a/lib/generators/active_record/devise_generator.rb
+++ b/lib/generators/active_record/devise_generator.rb
@@ -82,38 +82,17 @@ 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
-
      def postgresql?
-        ar_config && ar_config['adapter'] == 'postgresql'
-      end
-
-      def ar_config
-        if ActiveRecord::Base.configurations.respond_to?(:configs_for)
-          if rails61_and_up?
-            ActiveRecord::Base.configurations.configs_for(env_name: Rails.env, name: "primary").configuration_hash
-          else
-            ActiveRecord::Base.configurations.configs_for(env_name: Rails.env, spec_name: "primary").config
-          end
-        else
-          ActiveRecord::Base.configurations[Rails.env]
-        end
+        config = ActiveRecord::Base.configurations[Rails.env]
+        config && config['adapter'] == 'postgresql'
      end

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

     def primary_key_type
-       primary_key_string if rails5_and_up?
+       primary_key_string
     end

     def primary_key_string
--- a/lib/generators/devise/devise_generator.rb
+++ b/lib/generators/devise/devise_generator.rb
@@ -13,7 +13,7 @@ module Devise
      desc "Generates a model with the given NAME (if one does not exist) with devise " \
           "configuration plus a migration file and devise routes."

-      hook_for :orm, required: true
+      hook_for :orm

      class_option :routes, desc: "Generate routes", type: :boolean, default: true

--- a/lib/generators/devise/install_generator.rb
+++ b/lib/generators/devise/install_generator.rb
@@ -11,7 +11,7 @@ module Devise
      source_root File.expand_path("../../templates", __FILE__)

      desc "Creates a Devise initializer and copy locale files to your application."
-      class_option :orm, required: true
+      class_option :orm

      def copy_initializer
        unless options[:orm]
--- a/lib/generators/devise/views_generator.rb
+++ b/lib/generators/devise/views_generator.rb
@@ -42,7 +42,7 @@ module Devise
      def view_directory(name, _target_path = nil)
        directory name.to_s, _target_path || "#{target_path}/#{name}" do |content|
          if scope
-            content.gsub("devise/shared", "#{plural_scope}/shared")
+            content.gsub("devise/shared/links", "#{plural_scope}/shared/links").gsub("devise/shared/error_messages", "#{plural_scope}/shared/error_messages")
          else
            content
          end
--- a/lib/generators/templates/README
+++ b/lib/generators/templates/README
@@ -1,6 +1,6 @@
 ===============================================================================

-Depending on your application's configuration some manual setup may be required:
+Some setup you must do manually if you haven't yet:

  1. Ensure you have defined default url options in your environments files. Here
     is an example of default_url_options appropriate for a development environment
@@ -10,14 +10,10 @@ Depending on your application's configuration some manual setup may be required:

     In production, :host should be set to the actual host of your application.

-     * Required for all applications. *
-
  2. Ensure you have defined root_url to *something* in your config/routes.rb.
     For example:

       root to: "home#index"
-     
-     * Not required for API-only Applications *

  3. Ensure you have flash messages in app/views/layouts/application.html.erb.
     For example:
@@ -25,12 +21,8 @@ Depending on your application's configuration some manual setup may be required:
       <p class="notice"><%= notice %></p>
       <p class="alert"><%= alert %></p>

-     * Not required for API-only Applications *
-
  4. You can copy Devise views (for customization) to your app by running:

       rails g devise:views
-       
-     * Not required *

 ===============================================================================
--- a/lib/generators/templates/controllers/omniauth_callbacks_controller.rb
+++ b/lib/generators/templates/controllers/omniauth_callbacks_controller.rb
@@ -9,7 +9,7 @@ class <%= @scope_prefix %>OmniauthCallbacksController < Devise::OmniauthCallback
  # end

  # More info at:
-  # https://github.com/heartcombo/devise#omniauth
+  # https://github.com/plataformatec/devise#omniauth

  # GET|POST /resource/auth/twitter
  # def passthru
--- a/lib/generators/templates/devise.rb
+++ b/lib/generators/templates/devise.rb
@@ -1,11 +1,5 @@
 # frozen_string_literal: true

-# Assuming you have not yet modified this file, each configuration option below
-# is set to its default value. Note that some are commented out while others
-# are not: uncommented lines are intended to protect your configuration from
-# breaking changes in upgrades (i.e., in the event that future versions of
-# Devise change the default values for those options).
-#
 # Use this hook to configure devise mailer, warden hooks and so forth.
 # Many of these configuration options can be set straight in your model.
 Devise.setup do |config|
@@ -74,10 +68,7 @@ Devise.setup do |config|
  # Tell if authentication through HTTP Auth is enabled. False by default.
  # It can be set to an array that will enable http authentication only for the
  # given strategies, for example, `config.http_authenticatable = [:database]` will
-  # enable it only for database authentication.
-  # For API-only applications to support authentication "out-of-the-box", you will likely want to
-  # enable this with :database unless you are using a custom strategy.
-  # The supported strategies are:
+  # enable it only for database authentication. The supported strategies are:
  # :database      = Support basic authentication with authentication key + password
  # config.http_authenticatable = false

@@ -114,9 +105,6 @@ Devise.setup do |config|
  # ==> Configuration for :database_authenticatable
  # For bcrypt, this is the cost for hashing the password and defaults to 12. If
  # using other algorithms, it sets how many times you want the password to be hashed.
-  # The number of stretches used for generating the hashed password are stored
-  # with the hashed password. This allows you to change the stretches without
-  # invalidating existing passwords.
  #
  # Limiting the stretches to just one in testing will increase the performance of
  # your test suite dramatically. However, it is STRONGLY RECOMMENDED to not use
@@ -256,14 +244,14 @@ Devise.setup do |config|

  # ==> Navigation configuration
  # Lists the formats that should be treated as navigational. Formats like
-  # :html should redirect to the sign in page when the user does not have
+  # :html, should redirect to the sign in page when the user does not have
  # access, but formats like :xml or :json, should return 401.
  #
  # If you have any extra navigational formats, like :iphone or :mobile, you
  # should add them to the navigational formats lists.
  #
  # The "*/*" below is required to match Internet Explorer requests.
-  # config.navigational_formats = ['*/*', :html, :turbo_stream]
+  # config.navigational_formats = ['*/*', :html]

  # The default HTTP method used to sign out a resource. Default is :delete.
  config.sign_out_via = :delete
@@ -296,14 +284,12 @@ Devise.setup do |config|
  # so you need to do it manually. For the users scope, it would be:
  # config.omniauth_path_prefix = '/my_engine/users/auth'

-  # ==> Hotwire/Turbo configuration
-  # When using Devise with Hotwire/Turbo, the http status for error responses
-  # and some redirects must match the following. The default in Devise for existing
-  # 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_entity
-  config.responder.redirect_status = :see_other
+  # ==> Turbolinks configuration
+  # If your app is using Turbolinks, Turbolinks::Controller needs to be included to make redirection work correctly:
+  #
+  # ActiveSupport.on_load(:devise_failure_app) do
+  #   include Turbolinks::Controller
+  # end

  # ==> Configuration for :registerable

--- a/lib/generators/templates/simple_form_for/registrations/edit.html.erb
+++ b/lib/generators/templates/simple_form_for/registrations/edit.html.erb
@@ -30,6 +30,6 @@

 <h3>Cancel my account</h3>

-<div>Unhappy? <%= button_to "Cancel my account", registration_path(resource_name), data: { confirm: "Are you sure?", turbo_confirm: "Are you sure?" }, method: :delete %></div>
+<p>Unhappy? <%= link_to "Cancel my account", registration_path(resource_name), data: { confirm: "Are you sure?" }, method: :delete %></p>

 <%= link_to "Back", :back %>
--- a/test/controllers/custom_strategy_test.rb
+++ b/test/controllers/custom_strategy_test.rb
@@ -42,7 +42,9 @@ class CustomStrategyTest < Devise::ControllerTestCase
  test "custom strategy can return its own status code" do
    ret = get :new

-    # check the returned response
+    # check the returned rack array
+    # assert ret.is_a?(Array)
+    # assert_equal 400, ret.first
    assert ret.is_a?(ActionDispatch::TestResponse)

    # check the saved response as well. This is purely so that the response is available to the testing framework
@@ -53,10 +55,12 @@ class CustomStrategyTest < Devise::ControllerTestCase
  test "custom strategy can return custom headers" do
    ret = get :new

-    # check the returned response
+    # check the returned rack array
+    # assert ret.is_a?(Array)
+    # assert_equal ret.third['X-FOO'], 'BAR'
    assert ret.is_a?(ActionDispatch::TestResponse)

    # check the saved response headers as well.
-    assert_equal 'BAR', response.headers['X-FOO']
+    assert_equal response.headers['X-FOO'], 'BAR'
  end
 end
--- a/test/controllers/helper_methods_test.rb
+++ b/test/controllers/helper_methods_test.rb
@@ -14,8 +14,8 @@ class HelperMethodsTest < Devise::ControllerTestCase
  end

  test 'does not respond_to helper or helper_method' do
-    assert_not_respond_to @controller.class, :helper
-    assert_not_respond_to @controller.class, :helper_method
+    refute_respond_to @controller.class, :helper
+    refute_respond_to @controller.class, :helper_method
  end

  test 'defines methods like current_user' do
--- a/test/controllers/helpers_test.rb
+++ b/test/controllers/helpers_test.rb
@@ -15,21 +15,21 @@ class ControllerAuthenticatableTest < Devise::ControllerTestCase
    assert_equal @mock_warden, @controller.warden
  end

-  test 'proxy signed_in?(scope) to authenticate?' do
-    @mock_warden.expects(:authenticate?).with(scope: :my_scope)
+  test 'proxy signed_in?(scope) to authenticated?' do
+    @mock_warden.expects(:authenticated?).with(scope: :my_scope)
    @controller.signed_in?(:my_scope)
  end

-  test 'proxy signed_in?(nil) to authenticate?' do
+  test 'proxy signed_in?(nil) to authenticated?' do
    Devise.mappings.keys.each do |scope| # :user, :admin, :manager
-      @mock_warden.expects(:authenticate?).with(scope: scope)
+      @mock_warden.expects(:authenticated?).with(scope: scope)
    end
    @controller.signed_in?
  end

-  test 'proxy [group]_signed_in? to authenticate? with each scope' do
+  test 'proxy [group]_signed_in? to authenticated? with each scope' do
    [:user, :admin].each do |scope|
-      @mock_warden.expects(:authenticate?).with(scope: scope).returns(false)
+      @mock_warden.expects(:authenticated?).with(scope: scope).returns(false)
    end
    @controller.commenter_signed_in?
  end
@@ -81,7 +81,7 @@ class ControllerAuthenticatableTest < Devise::ControllerTestCase
  test 'proxy authenticate_[group]! to authenticate!? with each scope' do
    [:user, :admin].each do |scope|
      @mock_warden.expects(:authenticate!).with(scope: scope)
-      @mock_warden.expects(:authenticate?).with(scope: scope).returns(false)
+      @mock_warden.expects(:authenticated?).with(scope: scope).returns(false)
    end
    @controller.authenticate_commenter!
  end
@@ -91,18 +91,18 @@ class ControllerAuthenticatableTest < Devise::ControllerTestCase
    @controller.authenticate_publisher_account!
  end

-  test 'proxy user_signed_in? to authenticate with user scope' do
-    @mock_warden.expects(:authenticate).with(scope: :user).returns("user")
+  test 'proxy user_signed_in? to authenticated? with user scope' do
+    @mock_warden.expects(:authenticated?).with(scope: :user).returns("user")
    assert @controller.user_signed_in?
  end

-  test 'proxy admin_signed_in? to authenticatewith admin scope' do
-    @mock_warden.expects(:authenticate).with(scope: :admin)
-    assert_not @controller.admin_signed_in?
+  test 'proxy admin_signed_in? to authenticated? with admin scope' do
+    @mock_warden.expects(:authenticated?).with(scope: :admin)
+    refute @controller.admin_signed_in?
  end

-  test 'proxy publisher_account_signed_in? to authenticate with namespaced publisher account scope' do
-    @mock_warden.expects(:authenticate).with(scope: :publisher_account)
+  test 'proxy publisher_account_signed_in? to authenticated? with namespaced publisher account scope' do
+    @mock_warden.expects(:authenticated?).with(scope: :publisher_account)
    @controller.publisher_account_signed_in?
  end

@@ -319,10 +319,10 @@ class ControllerAuthenticatableTest < Devise::ControllerTestCase

  test 'is_flashing_format? is guarded against flash (middleware) not being loaded' do
    @controller.request.expects(:respond_to?).with(:flash).returns(false)
-    assert_not @controller.is_flashing_format?
+    refute @controller.is_flashing_format?
  end

  test 'is not a devise controller' do
-    assert_not @controller.devise_controller?
+    refute @controller.devise_controller?
  end
 end
--- a/test/controllers/internal_helpers_test.rb
+++ b/test/controllers/internal_helpers_test.rb
@@ -51,7 +51,7 @@ class HelpersTest < Devise::ControllerTestCase
  end

  test 'resources methods are not controller actions' do
-    assert_empty @controller.class.action_methods.delete_if { |m| m.include? 'commenter' }
+    assert @controller.class.action_methods.delete_if { |m| m.include? 'commenter' }.empty?
  end

  test 'require no authentication tests current mapping' do
@@ -121,7 +121,7 @@ class HelpersTest < Devise::ControllerTestCase
    MyController.send(:public, :navigational_formats)

    swap Devise, navigational_formats: ['*/*', :html] do
-      assert_not @controller.navigational_formats.include?("*/*")
+      refute @controller.navigational_formats.include?("*/*")
    end

    MyController.send(:protected, :navigational_formats)
--- a/test/controllers/load_hooks_controller_test.rb
+++ b/test/controllers/load_hooks_controller_test.rb
@@ -16,6 +16,6 @@ class LoadHooksControllerTest < Devise::ControllerTestCase
  end

  test 'load hook called when controller is loaded' do
-    assert_includes DeviseController.instance_methods, :defined_by_load_hook
+    assert DeviseController.instance_methods.include? :defined_by_load_hook
  end
-end
+end
--- a/test/controllers/passwords_controller_test.rb
+++ b/test/controllers/passwords_controller_test.rb
@@ -36,4 +36,10 @@ class PasswordsControllerTest < Devise::ControllerTestCase
    User.any_instance.expects :after_database_authentication
    put_update_with_params
  end
+
+  test 'redirects to new_password_path when token has expired' do
+    @user.update(reset_password_sent_at: Time.now - 1.year)
+    put_update_with_params
+    assert_redirected_to new_user_password_path
+  end
 end
--- 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 if the requested format is not navigational" do
+  test "#destroy doesn't set the flash and returns 204 status if the requested format is not navigational" do
    request.env["devise.mapping"] = Devise.mappings[:user]
    user = create_user
    user.confirm
@@ -88,6 +88,17 @@ 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
+    delete :destroy, format: 'json'
+    assert_equal 401, @response.status
+  end
+
+  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
+  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]
--- a/test/controllers/url_helpers_test.rb
+++ b/test/controllers/url_helpers_test.rb
@@ -5,7 +5,7 @@ require 'test_helper'
 class RoutesTest < Devise::ControllerTestCase
  tests ApplicationController

-  def assert_path_and_url(name, prepend_path = nil)
+  def assert_path_and_url(name, prepend_path=nil)
    @request.path = '/users/session'
    prepend_path = "#{prepend_path}_" if prepend_path

--- a/test/devise_test.rb
+++ b/test/devise_test.rb
@@ -71,8 +71,8 @@ class DeviseTest < ActiveSupport::TestCase
  test 'add new module using the helper method' do
    Devise.add_module(:coconut)
    assert_equal 1, Devise::ALL.select { |v| v == :coconut }.size
-    assert_not Devise::STRATEGIES.include?(:coconut)
-    assert_not defined?(Devise::Models::Coconut)
+    refute Devise::STRATEGIES.include?(:coconut)
+    refute defined?(Devise::Models::Coconut)
    Devise::ALL.delete(:coconut)

    Devise.add_module(:banana, strategy: :fruits)
@@ -88,11 +88,14 @@ class DeviseTest < ActiveSupport::TestCase

  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)
+      refute Devise.secure_compare(empty, "something")
+      refute Devise.secure_compare("something", empty)
    end
-    assert_not Devise.secure_compare("size_1", "size_four")
+    refute Devise.secure_compare("size_1", "size_four")
+  end
+
+  test 'Devise.secure_compare should return true if strings are same' do
+    assert Devise.secure_compare('', '')
  end

  test 'Devise.email_regexp should match valid email addresses' do
@@ -106,8 +109,4 @@ class DeviseTest < ActiveSupport::TestCase
      assert_no_match Devise.email_regexp, email
    end
  end
-
-  test 'Devise.activerecord51? deprecation' do
-    assert_deprecated { Devise.activerecord51? }
-  end
 end
--- a/test/failure_app_test.rb
+++ b/test/failure_app_test.rb
@@ -73,12 +73,13 @@ class FailureTest < ActiveSupport::TestCase
    instance_eval(&block)
  end

-  def call_failure(env_params = {})
+  def call_failure(env_params={})
    env = {
      'REQUEST_URI' => 'http://test.host/',
      'HTTP_HOST' => 'test.host',
      'REQUEST_METHOD' => 'GET',
      'warden.options' => { scope: :user },
+      'rack.session' => {},
      'action_dispatch.request.formats' => Array(env_params.delete('formats') || Mime[:html]),
      'rack.input' => "",
      'warden' => OpenStruct.new(message: nil)
@@ -184,17 +185,27 @@ 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]
@@ -213,18 +224,14 @@ class FailureTest < ActiveSupport::TestCase

    test 'set up a default message' do
      call_failure
-      if Devise::Test.rails71_and_up?
-        assert_empty @response.last.body
-      else
-        assert_match(/You are being/, @response.last.body)
-        assert_match(/redirected/, @response.last.body)
-        assert_match(/users\/sign_in/, @response.last.body)
-      end
+      assert_match(/You are being/, @response.last.body)
+      assert_match(/redirected/, @response.last.body)
+      assert_match(/users\/sign_in/, @response.last.body)
    end

    test 'works for any navigational format' do
-      swap Devise, navigational_formats: [:json] do
-        call_failure('formats' => Mime[:json])
+      swap Devise, navigational_formats: [:xml] do
+        call_failure('formats' => Mime[:xml])
        assert_equal 302, @response.first
      end
    end
@@ -239,7 +246,7 @@ class FailureTest < ActiveSupport::TestCase

  context 'For HTTP request' do
    test 'return 401 status' do
-      call_failure('formats' => Mime[:json])
+      call_failure('formats' => Mime[:xml])
      assert_equal 401, @response.first
    end

@@ -261,13 +268,13 @@ class FailureTest < ActiveSupport::TestCase
    end

    test 'return WWW-authenticate headers if model allows' do
-      call_failure('formats' => Mime[:json])
+      call_failure('formats' => Mime[:xml])
      assert_equal 'Basic realm="Application"', @response.second["WWW-Authenticate"]
    end

    test 'does not return WWW-authenticate headers if model does not allow' do
      swap Devise, http_authenticatable: false do
-        call_failure('formats' => Mime[:json])
+        call_failure('formats' => Mime[:xml])
        assert_nil @response.second["WWW-Authenticate"]
      end
    end
@@ -281,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

    context 'on ajax call' do
@@ -329,8 +336,8 @@ class FailureTest < ActiveSupport::TestCase
        "warden" => stub_everything
      }
      call_failure(env)
-      assert_includes @response.third.body, '<h2>Log in</h2>'
-      assert_includes @response.third.body, 'Invalid Email or password.'
+      assert @response.third.body.include?('<h2>Log in</h2>')
+      assert @response.third.body.include?('Invalid email or password.')
    end

    test 'calls the original controller if not confirmed email' do
@@ -340,8 +347,8 @@ class FailureTest < ActiveSupport::TestCase
        "warden" => stub_everything
      }
      call_failure(env)
-      assert_includes @response.third.body, '<h2>Log in</h2>'
-      assert_includes @response.third.body, 'You have to confirm your email address before continuing.'
+      assert @response.third.body.include?('<h2>Log in</h2>')
+      assert @response.third.body.include?('You have to confirm your email address before continuing.')
    end

    test 'calls the original controller if inactive account' do
@@ -351,8 +358,8 @@ class FailureTest < ActiveSupport::TestCase
        "warden" => stub_everything
      }
      call_failure(env)
-      assert_includes @response.third.body, '<h2>Log in</h2>'
-      assert_includes @response.third.body, 'Your account is not activated yet.'
+      assert @response.third.body.include?('<h2>Log in</h2>')
+      assert @response.third.body.include?('Your account is not activated yet.')
    end

    if Rails.application.config.respond_to?(:relative_url_root)
@@ -364,71 +371,18 @@ class FailureTest < ActiveSupport::TestCase
            "warden" => stub_everything
          }
          call_failure(env)
-          assert_includes @response.third.body, '<h2>Log in</h2>'
-          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"]
+          assert @response.third.body.include?('<h2>Log in</h2>')
+          assert @response.third.body.include?('Invalid email or password.')
+          assert_equal @request.env["SCRIPT_NAME"], '/sample'
+          assert_equal @request.env["PATH_INFO"], '/users/sign_in'
        end
      end
    end
-
-    # TODO: remove conditional/else when supporting only responders 3.1+
-    if ActionController::Responder.respond_to?(:error_status=)
-      test 'respects the configured responder `error_status` for the status code' do
-        swap Devise.responder, error_status: :unprocessable_entity do
-          env = {
-            "warden.options" => { recall: "devise/sessions#new", attempted_path: "/users/sign_in" },
-            "devise.mapping" => Devise.mappings[:user],
-            "warden" => stub_everything
-          }
-          call_failure(env)
-
-          assert_equal 422, @response.first
-          assert_includes @response.third.body, 'Invalid Email or password.'
-        end
-      end
-
-      test 'respects the configured responder `redirect_status` if the recall app returns a redirect status code' do
-        swap Devise.responder, redirect_status: :see_other do
-          env = {
-            "warden.options" => { recall: "devise/registrations#cancel", attempted_path: "/users/cancel" },
-            "devise.mapping" => Devise.mappings[:user],
-            "warden" => stub_everything
-          }
-          call_failure(env)
-
-          assert_equal 303, @response.first
-        end
-      end
-    else
-      test 'uses default hardcoded responder `error_status` for the status code since responders version does not support configuring it' do
-        env = {
-          "warden.options" => { recall: "devise/sessions#new", attempted_path: "/users/sign_in" },
-          "devise.mapping" => Devise.mappings[:user],
-          "warden" => stub_everything
-        }
-        call_failure(env)
-
-        assert_equal 200, @response.first
-        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
-        env = {
-          "warden.options" => { recall: "devise/registrations#cancel", attempted_path: "/users/cancel" },
-          "devise.mapping" => Devise.mappings[:user],
-          "warden" => stub_everything
-        }
-        call_failure(env)
-
-        assert_equal 302, @response.first
-      end
-    end
  end

  context "Lazy loading" do
    test "loads" do
-      assert_equal "yes it does", Devise::FailureApp.new.lazy_loading_works?
+      assert_equal Devise::FailureApp.new.lazy_loading_works?, "yes it does"
    end
  end
  context "Without Flash Support" do
--- a/test/generators/active_record_generator_test.rb
+++ b/test/generators/active_record_generator_test.rb
@@ -48,7 +48,6 @@ if DEVISE_ORM == :active_record
      run_generator %w(monster)
      assert_file "app/models/monster.rb"
      run_generator %w(monster)
-
      if Rails.version >= '5.0.3'
        assert_migration "db2/migrate/add_devise_to_monsters.rb"
      else
@@ -84,11 +83,7 @@ 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"]
-      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
+      assert_migration "db/migrate/devise_create_monsters.rb", /create_table :monsters, id: :uuid do/
    end
  end

--- a/test/generators/views_generator_test.rb
+++ b/test/generators/views_generator_test.rb
@@ -77,7 +77,7 @@ class ViewsGeneratorTest < Rails::Generators::TestCase
    assert_file "app/views/devise/mailer/reset_password_instructions.markerb"
  end

-  def assert_files(scope = nil, options = {})
+  def assert_files(scope = nil, options={})
    scope = "devise" if scope.nil?
    mail_template_engine = options[:mail_template_engine] || "html.erb"

--- a/test/integration/authenticatable_test.rb
+++ b/test/integration/authenticatable_test.rb
@@ -6,7 +6,7 @@ class AuthenticationSanityTest < Devise::IntegrationTest
  test 'sign in should not run model validations' do
    sign_in_as_user

-    assert_not User.validations_performed
+    refute User.validations_performed
  end

  test 'home should be accessible without sign in' do
@@ -18,13 +18,13 @@ class AuthenticationSanityTest < Devise::IntegrationTest
  test 'sign in as user should not authenticate admin scope' do
    sign_in_as_user
    assert warden.authenticated?(:user)
-    assert_not warden.authenticated?(:admin)
+    refute warden.authenticated?(:admin)
  end

  test 'sign in as admin should not authenticate user scope' do
    sign_in_as_admin
    assert warden.authenticated?(:admin)
-    assert_not warden.authenticated?(:user)
+    refute warden.authenticated?(:user)
  end

  test 'sign in as both user and admin at same time' do
@@ -39,7 +39,7 @@ class AuthenticationSanityTest < Devise::IntegrationTest
      sign_in_as_user
      sign_in_as_admin
      delete destroy_user_session_path
-      assert_not warden.authenticated?(:user)
+      refute warden.authenticated?(:user)
      assert warden.authenticated?(:admin)
    end
  end
@@ -50,7 +50,7 @@ class AuthenticationSanityTest < Devise::IntegrationTest
      sign_in_as_admin

      delete destroy_admin_session_path
-      assert_not warden.authenticated?(:admin)
+      refute warden.authenticated?(:admin)
      assert warden.authenticated?(:user)
    end
  end
@@ -61,8 +61,8 @@ class AuthenticationSanityTest < Devise::IntegrationTest
      sign_in_as_admin

      delete destroy_user_session_path
-      assert_not warden.authenticated?(:user)
-      assert_not warden.authenticated?(:admin)
+      refute warden.authenticated?(:user)
+      refute warden.authenticated?(:admin)
    end
  end

@@ -72,21 +72,21 @@ class AuthenticationSanityTest < Devise::IntegrationTest
      sign_in_as_admin

      delete destroy_admin_session_path
-      assert_not warden.authenticated?(:admin)
-      assert_not warden.authenticated?(:user)
+      refute warden.authenticated?(:admin)
+      refute warden.authenticated?(:user)
    end
  end

  test 'not signed in as admin should not be able to access admins actions' do
    get admins_path
    assert_redirected_to new_admin_session_path
-    assert_not warden.authenticated?(:admin)
+    refute warden.authenticated?(:admin)
  end

  test 'signed in as user should not be able to access admins actions' do
    sign_in_as_user
    assert warden.authenticated?(:user)
-    assert_not warden.authenticated?(:admin)
+    refute warden.authenticated?(:admin)

    get admins_path
    assert_redirected_to new_admin_session_path
@@ -95,7 +95,7 @@ class AuthenticationSanityTest < Devise::IntegrationTest
  test 'signed in as admin should be able to access admin actions' do
    sign_in_as_admin
    assert warden.authenticated?(:admin)
-    assert_not warden.authenticated?(:user)
+    refute warden.authenticated?(:user)

    get admins_path

@@ -123,7 +123,7 @@ class AuthenticationSanityTest < Devise::IntegrationTest

    get root_path
    assert_contain 'Signed out successfully'
-    assert_not warden.authenticated?(:admin)
+    refute warden.authenticated?(:admin)
  end

  test 'unauthenticated admin set message on sign out' do
@@ -146,13 +146,13 @@ class AuthenticationRoutesRestrictions < Devise::IntegrationTest
  test 'not signed in should not be able to access private route (authenticate denied)' do
    get private_path
    assert_redirected_to new_admin_session_path
-    assert_not warden.authenticated?(:admin)
+    refute warden.authenticated?(:admin)
  end

  test 'signed in as user should not be able to access private route restricted to admins (authenticate denied)' do
    sign_in_as_user
    assert warden.authenticated?(:user)
-    assert_not warden.authenticated?(:admin)
+    refute warden.authenticated?(:admin)
    get private_path
    assert_redirected_to new_admin_session_path
  end
@@ -160,7 +160,7 @@ class AuthenticationRoutesRestrictions < Devise::IntegrationTest
  test 'signed in as admin should be able to access private route restricted to admins (authenticate accepted)' do
    sign_in_as_admin
    assert warden.authenticated?(:admin)
-    assert_not warden.authenticated?(:user)
+    refute warden.authenticated?(:user)

    get private_path

@@ -172,7 +172,7 @@ class AuthenticationRoutesRestrictions < Devise::IntegrationTest
  test 'signed in as inactive admin should not be able to access private/active route restricted to active admins (authenticate denied)' do
    sign_in_as_admin(active: false)
    assert warden.authenticated?(:admin)
-    assert_not warden.authenticated?(:user)
+    refute warden.authenticated?(:user)

    assert_raises ActionController::RoutingError do
      get "/private/active"
@@ -182,7 +182,7 @@ class AuthenticationRoutesRestrictions < Devise::IntegrationTest
  test 'signed in as active admin should be able to access private/active route restricted to active admins (authenticate accepted)' do
    sign_in_as_admin(active: true)
    assert warden.authenticated?(:admin)
-    assert_not warden.authenticated?(:user)
+    refute warden.authenticated?(:user)

    get private_active_path

@@ -194,7 +194,7 @@ class AuthenticationRoutesRestrictions < Devise::IntegrationTest
  test 'signed in as admin should get admin dashboard (authenticated accepted)' do
    sign_in_as_admin
    assert warden.authenticated?(:admin)
-    assert_not warden.authenticated?(:user)
+    refute warden.authenticated?(:user)

    get dashboard_path

@@ -206,7 +206,7 @@ class AuthenticationRoutesRestrictions < Devise::IntegrationTest
  test 'signed in as user should get user dashboard (authenticated accepted)' do
    sign_in_as_user
    assert warden.authenticated?(:user)
-    assert_not warden.authenticated?(:admin)
+    refute warden.authenticated?(:admin)

    get dashboard_path

@@ -224,7 +224,7 @@ class AuthenticationRoutesRestrictions < Devise::IntegrationTest
  test 'signed in as inactive admin should not be able to access dashboard/active route restricted to active admins (authenticated denied)' do
    sign_in_as_admin(active: false)
    assert warden.authenticated?(:admin)
-    assert_not warden.authenticated?(:user)
+    refute warden.authenticated?(:user)

    assert_raises ActionController::RoutingError do
      get "/dashboard/active"
@@ -234,7 +234,7 @@ class AuthenticationRoutesRestrictions < Devise::IntegrationTest
  test 'signed in as active admin should be able to access dashboard/active route restricted to active admins (authenticated accepted)' do
    sign_in_as_admin(active: true)
    assert warden.authenticated?(:admin)
-    assert_not warden.authenticated?(:user)
+    refute warden.authenticated?(:user)

    get dashboard_active_path

@@ -246,7 +246,7 @@ class AuthenticationRoutesRestrictions < Devise::IntegrationTest
  test 'signed in user should not see unauthenticated page (unauthenticated denied)' do
    sign_in_as_user
    assert warden.authenticated?(:user)
-    assert_not warden.authenticated?(:admin)
+    refute warden.authenticated?(:admin)

    assert_raises ActionController::RoutingError do
      get join_path
@@ -321,15 +321,7 @@ class AuthenticationRedirectTest < Devise::IntegrationTest
  test 'require_no_authentication should set the already_authenticated flash message' do
    sign_in_as_user
    visit new_user_session_path
-    assert_equal I18n.t("devise.failure.already_authenticated"), flash[:alert]
-  end
-
-  test 'require_no_authentication should set the already_authenticated flash message as admin' do
-    store_translations :en, devise: { failure: { admin: { already_authenticated: 'You are already signed in as admin.' } } } do
-      sign_in_as_admin
-      visit new_admin_session_path
-      assert_equal "You are already signed in as admin.", flash[:alert]
-    end
+    assert_equal flash[:alert], I18n.t("devise.failure.already_authenticated")
  end
 end

@@ -344,20 +336,16 @@ class AuthenticationSessionTest < Devise::IntegrationTest
  end

  test 'refreshes _csrf_token' do
-    swap ApplicationController, allow_forgery_protection: true do
-      get new_user_session_path
-      token_from_session = request.session[:_csrf_token]
+    ApplicationController.allow_forgery_protection = true

-      if Devise::Test.rails71_and_up?
-        token_from_env = request.env["action_controller.csrf_token"]
-      end
+    begin
+      get new_user_session_path
+      token = request.session[:_csrf_token]

      sign_in_as_user
-      assert_not_equal request.session[:_csrf_token], token_from_session
-
-      if Devise::Test.rails71_and_up?
-        assert_not_equal request.env["action_controller.csrf_token"], token_from_env
-      end
+      assert_not_equal request.session[:_csrf_token], token
+    ensure
+      ApplicationController.allow_forgery_protection = false
    end
  end

@@ -397,7 +385,7 @@ class AuthenticationWithScopedViewsTest < Devise::IntegrationTest
      end

      assert_match %r{Special user view}, response.body
-      assert_not Devise::PasswordsController.scoped_views?
+      assert !Devise::PasswordsController.scoped_views?
    ensure
      Devise::SessionsController.send :remove_instance_variable, :@scoped_views
    end
@@ -424,13 +412,13 @@ class AuthenticationOthersTest < Devise::IntegrationTest
  test 'handles unverified requests gets rid of caches' do
    swap ApplicationController, allow_forgery_protection: true do
      post exhibit_user_url(1)
-      assert_not warden.authenticated?(:user)
+      refute warden.authenticated?(:user)

      sign_in_as_user
      assert warden.authenticated?(:user)

      post exhibit_user_url(1)
-      assert_not warden.authenticated?(:user)
+      refute warden.authenticated?(:user)
      assert_equal "User is not authenticated", response.body
    end
  end
@@ -466,6 +454,14 @@ class AuthenticationOthersTest < Devise::IntegrationTest
    end
  end

+  test 'sign in stub in xml format' do
+    get new_user_session_path(format: 'xml')
+    assert_match '<?xml version="1.0" encoding="UTF-8"?>', response.body
+    assert_match %r{<user>.*</user>}m, response.body
+    assert_match '<email></email>', response.body
+    assert_match '<password nil="true"', response.body
+  end
+
  test 'sign in stub in json format' do
    get new_user_session_path(format: 'json')
    assert_match '{"user":{', response.body
@@ -485,30 +481,30 @@ class AuthenticationOthersTest < Devise::IntegrationTest
  test 'uses the mapping from router' do
    sign_in_as_user visit: "/as/sign_in"
    assert warden.authenticated?(:user)
-    assert_not warden.authenticated?(:admin)
+    refute warden.authenticated?(:admin)
  end

-  test 'sign in with json format returns json response' do
+  test 'sign in with xml format returns xml response' do
    create_user
-    post user_session_path(format: 'json'), params: { user: {email: "user@test.com", password: '12345678'} }
+    post user_session_path(format: 'xml'), params: { user: {email: "user@test.com", password: '12345678'} }
    assert_response :success
-    assert_includes response.body, '{"user":{'
+    assert response.body.include? %(<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<user>)
  end

-  test 'sign in with json format is idempotent' do
-    get new_user_session_path(format: 'json')
+  test 'sign in with xml format is idempotent' do
+    get new_user_session_path(format: 'xml')
    assert_response :success

    create_user
-    post user_session_path(format: 'json'), params: { user: {email: "user@test.com", password: '12345678'} }
+    post user_session_path(format: 'xml'), params: { user: {email: "user@test.com", password: '12345678'} }
    assert_response :success

-    get new_user_session_path(format: 'json')
+    get new_user_session_path(format: 'xml')
    assert_response :success

-    post user_session_path(format: 'json'), params: { user: {email: "user@test.com", password: '12345678'} }
+    post user_session_path(format: 'xml'), params: { user: {email: "user@test.com", password: '12345678'} }
    assert_response :success
-    assert_includes response.body, '{"user":{'
+    assert response.body.include? %(<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<user>)
  end

  test 'sign out with html redirects' do
@@ -523,11 +519,18 @@ class AuthenticationOthersTest < Devise::IntegrationTest
    assert_current_url '/'
  end

+  test 'sign out with xml format returns no content' do
+    sign_in_as_user
+    delete destroy_user_session_path(format: 'xml')
+    assert_response :no_content
+    refute warden.authenticated?(:user)
+  end
+
  test 'sign out with json format returns no content' do
    sign_in_as_user
    delete destroy_user_session_path(format: 'json')
    assert_response :no_content
-    assert_not warden.authenticated?(:user)
+    refute warden.authenticated?(:user)
  end

  test 'sign out with non-navigational format via XHR does not redirect' do
@@ -535,7 +538,7 @@ class AuthenticationOthersTest < Devise::IntegrationTest
      sign_in_as_admin
      get destroy_sign_out_via_get_session_path, xhr: true, headers: { "HTTP_ACCEPT" => "application/json,text/javascript,*/*" } # NOTE: Bug is triggered by combination of XHR and */*.
      assert_response :no_content
-      assert_not warden.authenticated?(:user)
+      refute warden.authenticated?(:user)
    end
  end

@@ -545,7 +548,7 @@ class AuthenticationOthersTest < Devise::IntegrationTest
      sign_in_as_user
      delete destroy_user_session_path, xhr: true, headers: { "HTTP_ACCEPT" => "text/html,*/*" }
      assert_response :redirect
-      assert_not warden.authenticated?(:user)
+      refute warden.authenticated?(:user)
    end
  end
 end
@@ -554,8 +557,8 @@ 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_not warden.authenticated?(:user)
+      assert_contain "Invalid subdomain or password."
+      refute warden.authenticated?(:user)
    end
  end

@@ -584,7 +587,7 @@ class AuthenticationRequestKeysTest < Devise::IntegrationTest
        sign_in_as_user
      end

-      assert_not warden.authenticated?(:user)
+      refute warden.authenticated?(:user)
    end
  end

@@ -593,8 +596,8 @@ class AuthenticationRequestKeysTest < Devise::IntegrationTest

    swap Devise, request_keys: [:subdomain] do
      sign_in_as_user
-      assert_contain "Invalid Email or password."
-      assert_not warden.authenticated?(:user)
+      assert_contain "Invalid email or password."
+      refute warden.authenticated?(:user)
    end
  end

@@ -617,7 +620,7 @@ class AuthenticationSignOutViaTest < Devise::IntegrationTest
  test 'allow sign out via delete when sign_out_via provides only delete' do
    sign_in!(:sign_out_via_delete)
    delete destroy_sign_out_via_delete_session_path
-    assert_not warden.authenticated?(:sign_out_via_delete)
+    refute warden.authenticated?(:sign_out_via_delete)
  end

  test 'do not allow sign out via get when sign_out_via provides only delete' do
@@ -631,7 +634,7 @@ class AuthenticationSignOutViaTest < Devise::IntegrationTest
  test 'allow sign out via post when sign_out_via provides only post' do
    sign_in!(:sign_out_via_post)
    post destroy_sign_out_via_post_session_path
-    assert_not warden.authenticated?(:sign_out_via_post)
+    refute warden.authenticated?(:sign_out_via_post)
  end

  test 'do not allow sign out via get when sign_out_via provides only post' do
@@ -645,13 +648,13 @@ class AuthenticationSignOutViaTest < Devise::IntegrationTest
  test 'allow sign out via delete when sign_out_via provides delete and post' do
    sign_in!(:sign_out_via_delete_or_post)
    delete destroy_sign_out_via_delete_or_post_session_path
-    assert_not warden.authenticated?(:sign_out_via_delete_or_post)
+    refute warden.authenticated?(:sign_out_via_delete_or_post)
  end

  test 'allow sign out via post when sign_out_via provides delete and post' do
    sign_in!(:sign_out_via_delete_or_post)
    post destroy_sign_out_via_delete_or_post_session_path
-    assert_not warden.authenticated?(:sign_out_via_delete_or_post)
+    refute warden.authenticated?(:sign_out_via_delete_or_post)
  end

  test 'do not allow sign out via get when sign_out_via provides delete and post' do
--- a/test/integration/confirmable_test.rb
+++ b/test/integration/confirmable_test.rb
@@ -43,12 +43,12 @@ class ConfirmationTest < Devise::IntegrationTest
  test 'user with valid confirmation token should not be able to confirm an account after the token has expired' do
    swap Devise, confirm_within: 3.days do
      user = create_user(confirm: false, confirmation_sent_at: 4.days.ago)
-      assert_not user.confirmed?
+      refute user.confirmed?
      visit_user_confirmation_with_token(user.raw_confirmation_token)

      assert_have_selector '#error_explanation'
      assert_contain %r{needs to be confirmed within 3 days}
-      assert_not user.reload.confirmed?
+      refute user.reload.confirmed?
      assert_current_url "/users/confirmation?confirmation_token=#{user.raw_confirmation_token}"
    end
  end
@@ -86,7 +86,7 @@ class ConfirmationTest < Devise::IntegrationTest
  test 'user with valid confirmation token should be able to confirm an account before the token has expired' do
    swap Devise, confirm_within: 3.days do
      user = create_user(confirm: false, confirmation_sent_at: 2.days.ago)
-      assert_not user.confirmed?
+      refute user.confirmed?
      visit_user_confirmation_with_token(user.raw_confirmation_token)

      assert_contain 'Your email address has been successfully confirmed.'
@@ -132,7 +132,7 @@ class ConfirmationTest < Devise::IntegrationTest
      sign_in_as_user(confirm: false)

      assert_contain 'You have to confirm your email address before continuing'
-      assert_not warden.authenticated?(:user)
+      refute warden.authenticated?(:user)
    end
  end

@@ -142,8 +142,8 @@ class ConfirmationTest < Devise::IntegrationTest
        fill_in 'password', with: 'invalid'
      end

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

@@ -178,13 +178,13 @@ class ConfirmationTest < Devise::IntegrationTest
  test "should not be able to confirm an email with a blank confirmation token" do
    visit_user_confirmation_with_token("")

-    assert_contain %r{Confirmation token can['’]t be blank}
+    assert_contain "Confirmation token can't be blank"
  end

  test "should not be able to confirm an email with a nil confirmation token" do
    visit_user_confirmation_with_token(nil)

-    assert_contain %r{Confirmation token can['’]t be blank}
+    assert_contain "Confirmation token can't be blank"
  end

  test "should not be able to confirm user with blank confirmation token" do
@@ -193,7 +193,7 @@ class ConfirmationTest < Devise::IntegrationTest

    visit_user_confirmation_with_token("")

-    assert_contain %r{Confirmation token can['’]t be blank}
+    assert_contain "Confirmation token can't be blank"
  end

  test "should not be able to confirm user with nil confirmation token" do
@@ -202,7 +202,7 @@ class ConfirmationTest < Devise::IntegrationTest

    visit_user_confirmation_with_token(nil)

-    assert_contain %r{Confirmation token can['’]t be blank}
+    assert_contain "Confirmation token can't be blank"
  end

  test 'error message is configurable by resource name' do
@@ -214,32 +214,40 @@ class ConfirmationTest < Devise::IntegrationTest
    end
  end

-  test 'resent confirmation token with valid e-mail in JSON format should return empty and valid response' do
+  test 'resent confirmation token with valid E-Mail in XML format should return valid response' do
    user = create_user(confirm: false)
-    post user_confirmation_path(format: 'json'), params: { user: { email: user.email } }
+    post user_confirmation_path(format: 'xml'), params: { user: { email: user.email } }
    assert_response :success
-    assert_equal({}.to_json, response.body)
+    assert_equal response.body, {}.to_xml
  end

-  test 'resent confirmation token with invalid e-mail in JSON format should return invalid response' do
+  test 'resent confirmation token with invalid E-Mail in XML format should return invalid response' do
    create_user(confirm: false)
-    post user_confirmation_path(format: 'json'), params: { user: { email: 'invalid.test@test.com' } }
+    post user_confirmation_path(format: 'xml'), params: { user: { email: 'invalid.test@test.com' } }
    assert_response :unprocessable_entity
-    assert_includes response.body, '{"errors":{'
+    assert response.body.include? %(<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<errors>)
  end

-  test 'confirm account with valid confirmation token in JSON format should return valid response' do
+  test 'confirm account with valid confirmation token in XML format should return valid response' do
    user = create_user(confirm: false)
-    get user_confirmation_path(confirmation_token: user.raw_confirmation_token, format: 'json')
+    get user_confirmation_path(confirmation_token: user.raw_confirmation_token, format: 'xml')
    assert_response :success
-    assert_includes response.body, '{"user":{'
+    assert response.body.include? %(<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<user>)
  end

-  test 'confirm account with invalid confirmation token in JSON format should return invalid response' do
+  test 'confirm account with invalid confirmation token in XML format should return invalid response' do
    create_user(confirm: false)
-    get user_confirmation_path(confirmation_token: 'invalid_confirmation', format: 'json')
+    get user_confirmation_path(confirmation_token: 'invalid_confirmation', format: 'xml')
    assert_response :unprocessable_entity
-    assert_includes response.body, '{"confirmation_token":['
+    assert response.body.include? %(<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<errors>)
+  end
+
+  test 'request an account confirmation account with JSON, should return an empty JSON' do
+    user = create_user(confirm: false)
+
+    post user_confirmation_path, params: { user: { email: user.email }, format: :json }
+    assert_response :success
+    assert_equal response.body, {}.to_json
  end

  test "when in paranoid mode and with a valid e-mail, should not say that the e-mail is valid" do
@@ -274,7 +282,7 @@ class ConfirmationTest < Devise::IntegrationTest
 end

 class ConfirmationOnChangeTest < Devise::IntegrationTest
-  def create_second_admin(options = {})
+  def create_second_admin(options={})
    @admin = nil
    create_admin(options)
  end
@@ -308,7 +316,7 @@ class ConfirmationOnChangeTest < Devise::IntegrationTest
    assert_contain 'Your email address has been successfully confirmed.'
    assert_current_url '/admin_area/sign_in'
    assert admin.reload.confirmed?
-    assert_not admin.reload.pending_reconfirmation?
+    refute admin.reload.pending_reconfirmation?
  end

  test 'admin with previously valid confirmation token should not be able to confirm email after email changed again' do
@@ -330,7 +338,7 @@ class ConfirmationOnChangeTest < Devise::IntegrationTest
    assert_contain 'Your email address has been successfully confirmed.'
    assert_current_url '/admin_area/sign_in'
    assert admin.reload.confirmed?
-    assert_not admin.reload.pending_reconfirmation?
+    refute admin.reload.pending_reconfirmation?
  end

  test 'admin email should be unique also within unconfirmed_email' do
--- a/test/integration/database_authenticatable_test.rb
+++ b/test/integration/database_authenticatable_test.rb
@@ -21,7 +21,7 @@ class DatabaseAuthenticationTest < Devise::IntegrationTest
        fill_in 'email', with: 'foo@bar.com'
      end

-      assert_not warden.authenticated?(:user)
+      refute warden.authenticated?(:user)
    end
  end

@@ -43,14 +43,14 @@ class DatabaseAuthenticationTest < Devise::IntegrationTest
        fill_in 'email', with: ' foo@bar.com '
      end

-      assert_not warden.authenticated?(:user)
+      refute warden.authenticated?(:user)
    end
  end

  test 'sign in should not authenticate if not using proper authentication keys' do
    swap Devise, authentication_keys: [:username] do
      sign_in_as_user
-      assert_not warden.authenticated?(:user)
+      refute warden.authenticated?(:user)
    end
  end

@@ -61,17 +61,17 @@ class DatabaseAuthenticationTest < Devise::IntegrationTest
      end

      assert_contain 'Invalid email address'
-      assert_not warden.authenticated?(:admin)
+      refute warden.authenticated?(:admin)
    end
  end

-  test 'sign in with invalid password should return to sign in form with error message' do
+  test 'sign in with invalid pasword should return to sign in form with error message' do
    sign_in_as_admin do
      fill_in 'password', with: 'abcdef'
    end

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

  test 'when in paranoid mode and without a valid e-mail' do
@@ -80,9 +80,9 @@ class DatabaseAuthenticationTest < Devise::IntegrationTest
        sign_in_as_user do
          fill_in 'email', with: 'wrongemail@test.com'
        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
@@ -6,7 +6,7 @@ class HttpAuthenticationTest < Devise::IntegrationTest
  test 'sign in with HTTP should not run model validations' do
    sign_in_as_new_user_with_http

-    assert_not User.validations_performed
+    refute User.validations_performed
  end

  test 'handles unverified requests gets rid of caches but continues signed in' do
@@ -22,10 +22,10 @@ class HttpAuthenticationTest < Devise::IntegrationTest
    swap Devise, skip_session_storage: [] do
      sign_in_as_new_user_with_http
      assert_response 200
-      assert_match '"email":"user@test.com"', response.body
+      assert_match '<email>user@test.com</email>', response.body
      assert warden.authenticated?(:user)

-      get users_path(format: :json)
+      get users_path(format: :xml)
      assert_response 200
    end
  end
@@ -34,10 +34,10 @@ class HttpAuthenticationTest < Devise::IntegrationTest
    swap Devise, skip_session_storage: [:http_auth] do
      sign_in_as_new_user_with_http
      assert_response 200
-      assert_match '"email":"user@test.com"', response.body
+      assert_match '<email>user@test.com</email>', response.body
      assert warden.authenticated?(:user)

-      get users_path(format: :json)
+      get users_path(format: :xml)
      assert_response 401
    end
  end
@@ -51,8 +51,8 @@ class HttpAuthenticationTest < Devise::IntegrationTest
  test 'uses the request format as response content type' do
    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_equal "application/xml; charset=utf-8", headers["Content-Type"]
+    assert_match "<error>Invalid email or password.</error>", response.body
  end

  test 'returns a custom response with www-authenticate and chosen realm' do
@@ -67,7 +67,7 @@ class HttpAuthenticationTest < Devise::IntegrationTest
    swap Devise, authentication_keys: [:username] do
      sign_in_as_new_user_with_http("usertest")
      assert_response :success
-      assert_match '"email":"user@test.com"', response.body
+      assert_match '<email>user@test.com</email>', response.body
      assert warden.authenticated?(:user)
    end
  end
@@ -76,7 +76,7 @@ class HttpAuthenticationTest < Devise::IntegrationTest
    swap Devise, authentication_keys: { username: false, email: false } do
      sign_in_as_new_user_with_http("usertest")
      assert_response :success
-      assert_match '"email":"user@test.com"', response.body
+      assert_match '<email>user@test.com</email>', response.body
      assert warden.authenticated?(:user)
    end
  end
@@ -85,7 +85,7 @@ class HttpAuthenticationTest < Devise::IntegrationTest
    swap Devise, authentication_keys: { email: false, username: false }, http_authentication_key: :username do
      sign_in_as_new_user_with_http("usertest")
      assert_response :success
-      assert_match '"email":"user@test.com"', response.body
+      assert_match '<email>user@test.com</email>', response.body
      assert warden.authenticated?(:user)
    end
  end
@@ -99,15 +99,16 @@ class HttpAuthenticationTest < Devise::IntegrationTest
  end

  private
-    def sign_in_as_new_user_with_http(username = "user@test.com", password = "12345678")
+    def sign_in_as_new_user_with_http(username="user@test.com", password="12345678")
      user = create_user
-      get users_path(format: :json), headers: { "HTTP_AUTHORIZATION" => "Basic #{Base64.encode64("#{username}:#{password}")}" }
+      get users_path(format: :xml), headers: { "HTTP_AUTHORIZATION" => "Basic #{Base64.encode64("#{username}:#{password}")}" }
      user
    end

    # Sign in with oauth2 token. This is just to test that it isn't misinterpreted as basic authentication
    def add_oauth2_header
      user = create_user
-      get users_path(format: :json), headers: { "HTTP_AUTHORIZATION" => "OAuth #{Base64.encode64("#{user.email}:12345678")}" }
+      get users_path(format: :xml), headers: { "HTTP_AUTHORIZATION" => "OAuth #{Base64.encode64("#{user.email}:12345678")}" }
    end
+
 end
--- a/test/integration/lockable_test.rb
+++ b/test/integration/lockable_test.rb
@@ -87,7 +87,7 @@ class LockTest < Devise::IntegrationTest

    assert_current_url "/users/sign_in"
    assert_contain 'Your account has been unlocked successfully. Please sign in to continue.'
-    assert_not user.reload.access_locked?
+    refute user.reload.access_locked?
  end

  test "user should not send a new e-mail if already locked" do
@@ -99,12 +99,12 @@ class LockTest < Devise::IntegrationTest

    sign_in_as_user(password: "invalid")
    assert_contain 'Your account is locked.'
-    assert_empty ActionMailer::Base.deliveries
+    assert ActionMailer::Base.deliveries.empty?
  end

  test 'error message is configurable by resource name' do
    store_translations :en, devise: {
-        failure: {user: {locked: "You are locked!"}}
+        failure: {user: {locked: { both: "You are locked!" }}}
    } do

      user = create_user(locked: true)
@@ -118,7 +118,7 @@ class LockTest < Devise::IntegrationTest

  test "user should not be able to sign in when locked" do
    store_translations :en, devise: {
-        failure: {user: {locked: "You are locked!"}}
+        failure: {user: {locked: {both: "You are locked!"}}}
    } do

      user = create_user(locked: true)
@@ -130,39 +130,48 @@ class LockTest < Devise::IntegrationTest
    end
  end

-  test 'user should be able to request a new unlock token via JSON request and should return empty and valid response' do
+  test 'user should be able to request a new unlock token via XML request' do
    user = create_user(locked: true)
    ActionMailer::Base.deliveries.clear

-    post user_unlock_path(format: 'json'), params: { user: {email: user.email} }
+    post user_unlock_path(format: 'xml'), params: { user: {email: user.email} }
    assert_response :success
-    assert_equal({}.to_json, response.body)
+    assert_equal response.body, {}.to_xml
+
    assert_equal 1, ActionMailer::Base.deliveries.size
  end

-  test 'unlocked user should not be able to request a unlock token via JSON request' do
+  test 'unlocked user should not be able to request a unlock token via XML request' do
    user = create_user(locked: false)
    ActionMailer::Base.deliveries.clear

-    post user_unlock_path(format: 'json'), params: { user: {email: user.email} }
+    post user_unlock_path(format: 'xml'), params: { user: {email: user.email} }
    assert_response :unprocessable_entity
-    assert_includes response.body, '{"errors":{'
+    assert response.body.include? %(<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<errors>)
    assert_equal 0, ActionMailer::Base.deliveries.size
  end

-  test 'user with valid unlock token should be able to unlock account via JSON request' do
+  test 'user with valid unlock token should be able to unlock account via XML request' do
    user = create_user()
    raw  = user.lock_access!
    assert user.access_locked?
-    get user_unlock_path(format: 'json', unlock_token: raw)
+    get user_unlock_path(format: 'xml', unlock_token: raw)
    assert_response :success
-    assert_includes response.body, '{"user":{'
+    assert response.body.include? %(<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<user>)
  end

-  test 'user with invalid unlock token should not be able to unlock the account via JSON request' do
-    get user_unlock_path(format: 'json', unlock_token: 'invalid_token')
+
+  test 'user with invalid unlock token should not be able to unlock the account via XML request' do
+    get user_unlock_path(format: 'xml', unlock_token: 'invalid_token')
    assert_response :unprocessable_entity
-    assert_includes response.body, '{"unlock_token":['
+    assert response.body.include? %(<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<errors>)
+  end
+
+  test "when using json to ask a unlock request, should not return the user" do
+    user = create_user(locked: true)
+    post user_unlock_path(format: "json", user: {email: user.email})
+    assert_response :success
+    assert_equal response.body, {}.to_json
  end

  test "in paranoid mode, when trying to unlock a user that exists it should not say that it exists if it is locked" do
--- a/test/integration/omniauthable_test.rb
+++ b/test/integration/omniauthable_test.rb
@@ -23,9 +23,6 @@ class OmniauthableIntegrationTest < Devise::IntegrationTest
      "extra" => {"user_hash" => FACEBOOK_INFO}
    }
    OmniAuth.config.add_camelization 'facebook', 'FaceBook'
-    if OmniAuth.config.respond_to?(:request_validation_phase)
-      OmniAuth.config.request_validation_phase = ->(env) {}
-    end
  end

  teardown do
@@ -48,17 +45,17 @@ class OmniauthableIntegrationTest < Devise::IntegrationTest
  test "omniauth sign in should not run model validations" do
    stub_action!(:sign_in_facebook) do
      create_user
-      post "/users/auth/facebook"
-      follow_redirect!
+      visit "/users/sign_in"
+      click_link "Sign in with FaceBook"
      assert warden.authenticated?(:user)

-      assert_not User.validations_performed
+      refute User.validations_performed
    end
  end

  test "can access omniauth.auth in the env hash" do
-    post "/users/auth/facebook"
-    follow_redirect!
+    visit "/users/sign_in"
+    click_link "Sign in with FaceBook"

    json = ActiveSupport::JSON.decode(response.body)

@@ -71,8 +68,8 @@ class OmniauthableIntegrationTest < Devise::IntegrationTest

  test "cleans up session on sign up" do
    assert_no_difference "User.count" do
-      post "/users/auth/facebook"
-      follow_redirect!
+      visit "/users/sign_in"
+      click_link "Sign in with FaceBook"
    end

    assert session["devise.facebook_data"]
@@ -87,58 +84,49 @@ class OmniauthableIntegrationTest < Devise::IntegrationTest
    assert_current_url "/"
    assert_contain "You have signed up successfully."
    assert_contain "Hello User user@example.com"
-    assert_not session["devise.facebook_data"]
+    refute session["devise.facebook_data"]
  end

  test "cleans up session on cancel" do
    assert_no_difference "User.count" do
-      post "/users/auth/facebook"
-      follow_redirect!
+      visit "/users/sign_in"
+      click_link "Sign in with FaceBook"
    end

    assert session["devise.facebook_data"]
    visit "/users/cancel"
-    assert_not session["devise.facebook_data"]
+    assert !session["devise.facebook_data"]
  end

  test "cleans up session on sign in" do
    assert_no_difference "User.count" do
-      post "/users/auth/facebook"
-      follow_redirect!
+      visit "/users/sign_in"
+      click_link "Sign in with FaceBook"
    end

    assert session["devise.facebook_data"]
    sign_in_as_user
-    assert_not session["devise.facebook_data"]
+    assert !session["devise.facebook_data"]
  end

  test "sign in and send remember token if configured" do
-    post "/users/auth/facebook"
-    follow_redirect!
+    visit "/users/sign_in"
+    click_link "Sign in with FaceBook"
    assert_nil warden.cookies["remember_user_token"]

    stub_action!(:sign_in_facebook) do
      create_user
-      post "/users/auth/facebook"
-      follow_redirect!
+      visit "/users/sign_in"
+      click_link "Sign in with FaceBook"
      assert warden.authenticated?(:user)
      assert warden.cookies["remember_user_token"]
    end
  end

-  test "generates a link to authenticate with provider" do
-    visit "/users/sign_in"
-    assert_select "form[action=?][method=post]", "/users/auth/facebook" do
-      assert_select "input[type=submit][value=?]", "Sign in with FaceBook"
-    end
-  end
-
  test "generates a proper link when SCRIPT_NAME is set" do
    header 'SCRIPT_NAME', '/q'
    visit "/users/sign_in"
-    assert_select "form[action=?][method=post]", "/q/users/auth/facebook" do
-      assert_select "input[type=submit][value=?]", "Sign in with FaceBook"
-    end
+    assert_select "a", href: "/q/users/auth/facebook"
  end

  test "handles callback error parameter according to the specification" do
@@ -151,10 +139,10 @@ class OmniauthableIntegrationTest < Devise::IntegrationTest
  test "handles other exceptions from OmniAuth" do
    OmniAuth.config.mock_auth[:facebook] = :invalid_credentials

-    post "/users/auth/facebook"
-    follow_redirect!
-    follow_redirect!
+    visit "/users/sign_in"
+    click_link "Sign in with FaceBook"

+    assert_current_url "/users/sign_in"
    assert_contain 'Could not authenticate you from FaceBook because "Invalid credentials".'
  end
 end
--- a/test/integration/recoverable_test.rb
+++ b/test/integration/recoverable_test.rb
@@ -12,7 +12,7 @@ class PasswordTest < Devise::IntegrationTest
  def request_forgot_password(&block)
    visit_new_password_path
    assert_response :success
-    assert_not warden.authenticated?(:user)
+    refute warden.authenticated?(:user)

    fill_in 'email', with: 'user@test.com'
    yield if block_given?
@@ -21,7 +21,7 @@ class PasswordTest < Devise::IntegrationTest
    click_button 'Send me reset password instructions'
  end

-  def reset_password(options = {}, &block)
+  def reset_password(options={}, &block)
    unless options[:visit] == false
      visit edit_user_password_path(reset_password_token: options[:reset_password_token] || "abcdef")
      assert_response :success
@@ -33,17 +33,6 @@ class PasswordTest < Devise::IntegrationTest
    click_button 'Change my password'
  end

-  test 'reset password should send to user record email and avoid case mapping collisions' do
-    create_user(email: 'user@github.com')
-
-    request_forgot_password do
-      fill_in 'email', with: 'user@gıthub.com'
-    end
-
-    mail = ActionMailer::Base.deliveries.last
-    assert_equal ['user@github.com'], mail.to
-  end
-
  test 'reset password with email of different case should succeed when email is in the list of case insensitive keys' do
    create_user(email: 'Foo@Bar.com')

@@ -160,7 +149,20 @@ class PasswordTest < Devise::IntegrationTest
    assert_current_url '/users/password'
    assert_have_selector '#error_explanation'
    assert_contain %r{Reset password token(.*)invalid}
-    assert_not user.reload.valid_password?('987654321')
+    refute user.reload.valid_password?('987654321')
+  end
+
+  test 'not authenticated user with expired reset password token should be redirected to new password path' do
+    user = create_user
+    request_forgot_password
+    user.update(reset_password_sent_at: Time.now - 1.year)
+
+    visit edit_user_password_path(reset_password_token: 'abcdef')
+    fill_in 'New password', with: '987654321'
+    fill_in 'Confirm new password', with: '987654321'
+    click_button 'Change my password'
+
+    assert_contain 'The password recovery link expired. Please request a new one.'
  end

  test 'not authenticated user with valid reset password token but invalid password should not be able to change their password' do
@@ -173,8 +175,8 @@ class PasswordTest < Devise::IntegrationTest
    assert_response :success
    assert_current_url '/users/password'
    assert_have_selector '#error_explanation'
-    assert_contain %r{Password confirmation doesn['’]t match Password}
-    assert_not user.reload.valid_password?('987654321')
+    assert_contain "Password confirmation doesn't match Password"
+    refute user.reload.valid_password?('987654321')
  end

  test 'not authenticated user with valid data should be able to change their password' do
@@ -194,7 +196,7 @@ class PasswordTest < Devise::IntegrationTest
    reset_password {  fill_in 'Confirm new password', with: 'other_password' }
    assert_response :success
    assert_have_selector '#error_explanation'
-    assert_not user.reload.valid_password?('987654321')
+    refute user.reload.valid_password?('987654321')

    reset_password visit: false
    assert_contain 'Your password has been changed successfully.'
@@ -218,32 +220,7 @@ class PasswordTest < Devise::IntegrationTest
      assert_contain 'Your password has been changed successfully.'
      assert_not_contain 'You are now signed in.'
      assert_equal new_user_session_path, @request.path
-      assert_not warden.authenticated?(:user)
-    end
-  end
-
-  test 'does not sign in user automatically after changing its password if resource_class.sign_in_after_reset_password is false' do
-    swap_model_config User, sign_in_after_reset_password: false do
-      create_user
-      request_forgot_password
-      reset_password
-
-      assert_contain 'Your password has been changed successfully'
-      assert_not_contain 'You are now signed in.'
-      assert_equal new_user_session_path, @request.path
-      assert_not warden.authenticated?(:user)
-    end
-  end
-
-  test 'sign in user automatically after changing its password if resource_class.sign_in_after_reset_password is true' do
-    swap Devise, sign_in_after_reset_password: false do
-      swap_model_config User, sign_in_after_reset_password: true do
-        create_user
-        request_forgot_password
-        reset_password
-
-        assert warden.authenticated?(:user)
-      end
+      assert !warden.authenticated?(:user)
    end
  end

@@ -257,7 +234,7 @@ class PasswordTest < Devise::IntegrationTest
        assert_contain 'Your password has been changed successfully.'
        assert_not_contain 'You are now signed in.'
        assert_equal new_user_session_path, @request.path
-        assert_not warden.authenticated?(:user)
+        assert !warden.authenticated?(:user)
      end
    end
  end
@@ -269,7 +246,7 @@ class PasswordTest < Devise::IntegrationTest
      reset_password

      assert_contain 'Your password has been changed successfully.'
-      assert_not user.reload.access_locked?
+      assert !user.reload.access_locked?
      assert warden.authenticated?(:user)
    end
  end
@@ -281,58 +258,68 @@ class PasswordTest < Devise::IntegrationTest
      reset_password

      assert_contain 'Your password has been changed successfully.'
-      assert_not user.reload.access_locked?
+      assert !user.reload.access_locked?
      assert warden.authenticated?(:user)
    end
  end

-  test 'reset password request with valid e-mail in JSON format should return empty and valid response' do
+  test 'reset password request with valid E-Mail in XML format should return valid response' do
    create_user
-    post user_password_path(format: 'json'), params: { user: {email: "user@test.com"} }
+    post user_password_path(format: 'xml'), params: { user: {email: "user@test.com"} }
    assert_response :success
-    assert_equal({}.to_json, response.body)
+    assert_equal response.body, { }.to_xml
  end

-  test 'reset password request with invalid e-mail in JSON format should return valid response' do
+  test 'reset password request with invalid E-Mail in XML format should return valid response' do
    create_user
-    post user_password_path(format: 'json'), params: { user: {email: "invalid.test@test.com"} }
+    post user_password_path(format: 'xml'), params: { user: {email: "invalid.test@test.com"} }
    assert_response :unprocessable_entity
-    assert_includes response.body, '{"errors":{'
+    assert response.body.include? %(<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<errors>)
  end

-  test 'reset password request with invalid e-mail in JSON format should return empty and valid response in paranoid mode' do
+  test 'reset password request with invalid E-Mail in XML format should return empty and valid response' do
    swap Devise, paranoid: true do
      create_user
-      post user_password_path(format: 'json'), params: { user: {email: "invalid@test.com"} }
+      post user_password_path(format: 'xml'), params: { user: {email: "invalid@test.com"} }
      assert_response :success
-      assert_equal({}.to_json, response.body)
+      assert_equal response.body, { }.to_xml
    end
  end

-  test 'change password with valid parameters in JSON format should return valid response' do
+  test 'change password with valid parameters in XML format should return valid response' do
    create_user
    request_forgot_password
-    put user_password_path(format: 'json'), params: { user: {
+    put user_password_path(format: 'xml'), params: { user: {
      reset_password_token: 'abcdef', password: '987654321', password_confirmation: '987654321'
-    } }
+      }
+    }
    assert_response :success
    assert warden.authenticated?(:user)
  end

-  test 'change password with invalid token in JSON format should return invalid response' do
+  test 'change password with invalid token in XML format should return invalid response' do
    create_user
    request_forgot_password
-    put user_password_path(format: 'json'), params: { user: {reset_password_token: 'invalid.token', password: '987654321', password_confirmation: '987654321'} }
+    put user_password_path(format: 'xml'), params: { user: {reset_password_token: 'invalid.token', password: '987654321', password_confirmation: '987654321'} }
    assert_response :unprocessable_entity
-    assert_includes response.body, '{"errors":{'
+    assert response.body.include? %(<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<errors>)
  end

-  test 'change password with invalid new password in JSON format should return invalid response' do
+  test 'change password with invalid new password in XML format should return invalid response' do
    user = create_user
    request_forgot_password
-    put user_password_path(format: 'json'), params: { user: {reset_password_token: user.reload.reset_password_token, password: '', password_confirmation: '987654321'} }
+    put user_password_path(format: 'xml'), params: { user: {reset_password_token: user.reload.reset_password_token, password: '', password_confirmation: '987654321'} }
    assert_response :unprocessable_entity
-    assert_includes response.body, '{"errors":{'
+    assert response.body.include? %(<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<errors>)
+  end
+
+  test "when using json requests to ask a confirmable request, should not return the object" do
+    user = create_user(confirm: false)
+
+    post user_password_path(format: :json), params: { user: { email: user.email } }
+
+    assert_response :success
+    assert_equal response.body, "{}"
  end

  test "when in paranoid mode and with an invalid e-mail, asking to reset a password should display a message that does not indicates that the e-mail does not exists in the database" do
--- a/test/integration/registerable_test.rb
+++ b/test/integration/registerable_test.rb
@@ -20,7 +20,7 @@ class RegistrationTest < Devise::IntegrationTest
    assert_current_url "/admin_area/home"

    admin = Admin.to_adapter.find_first(order: [:id, :desc])
-    assert_equal 'new_user@test.com', admin.email
+    assert_equal admin.email, 'new_user@test.com'
  end

  test 'a guest admin should be able to sign in and be redirected to a custom location' do
@@ -66,11 +66,11 @@ class RegistrationTest < Devise::IntegrationTest
    assert_not_contain 'You have to confirm your account before continuing'
    assert_current_url "/"

-    assert_not warden.authenticated?(:user)
+    refute warden.authenticated?(:user)

    user = User.to_adapter.find_first(order: [:id, :desc])
-    assert_equal 'new_user@test.com', user.email
-    assert_not user.confirmed?
+    assert_equal user.email, 'new_user@test.com'
+    refute user.confirmed?
  end

  test 'a guest user should receive the confirmation instructions from the default mailer' do
@@ -94,7 +94,7 @@ class RegistrationTest < Devise::IntegrationTest
    click_button 'Sign up'

    assert_current_url "/?custom=1"
-    assert_not warden.authenticated?(:user)
+    refute warden.authenticated?(:user)
  end

  test 'a guest user cannot sign up with invalid information' do
@@ -112,11 +112,11 @@ class RegistrationTest < Devise::IntegrationTest
    assert_template 'registrations/new'
    assert_have_selector '#error_explanation'
    assert_contain "Email is invalid"
-    assert_contain %r{Password confirmation doesn['’]t match Password}
+    assert_contain "Password confirmation doesn't match Password"
    assert_contain "2 errors prohibited"
    assert_nil User.to_adapter.find_first

-    assert_not warden.authenticated?(:user)
+    refute warden.authenticated?(:user)
  end

  test 'a guest should not sign up with email/password that already exists' do
@@ -135,7 +135,7 @@ class RegistrationTest < Devise::IntegrationTest
    assert_current_url '/users'
    assert_contain(/Email.*already.*taken/)

-    assert_not warden.authenticated?(:user)
+    refute warden.authenticated?(:user)
  end

  test 'a guest should not be able to change account' do
@@ -189,9 +189,9 @@ class RegistrationTest < Devise::IntegrationTest
      fill_in 'current password', with: '12345678'
      click_button 'Update'

-      assert_contain 'Your account has been updated successfully, but since your password was changed, you need to sign in again.'
+      assert_contain 'Your account has been updated successfully, but since your password was changed, you need to sign in again'
      assert_equal new_user_session_path, @request.path
-      assert_not warden.authenticated?(:user)
+      refute warden.authenticated?(:user)
    end
  end

@@ -251,10 +251,10 @@ class RegistrationTest < Devise::IntegrationTest
    fill_in 'current password', with: '12345678'
    click_button 'Update'

-    assert_contain %r{Password confirmation doesn['’]t match Password}
-    assert_not User.to_adapter.find_first.valid_password?('pas123')
+    assert_contain "Password confirmation doesn't match Password"
+    refute User.to_adapter.find_first.valid_password?('pas123')
  end
-
+  
  test 'a signed in user should see a warning about minimum password length' do
    sign_in_as_user
    get edit_user_registration_path
@@ -268,7 +268,7 @@ class RegistrationTest < Devise::IntegrationTest
    click_button "Cancel my account"
    assert_contain "Bye! Your account has been successfully cancelled. We hope to see you again soon."

-    assert_empty User.to_adapter.find_all
+    assert User.to_adapter.find_all.empty?
  end

  test 'a user should be able to cancel sign up by deleting data in the session' do
@@ -283,6 +283,13 @@ class RegistrationTest < Devise::IntegrationTest
    assert_redirected_to new_user_registration_path
  end

+  test 'a user with XML sign up stub' do
+    get new_user_registration_path(format: 'xml')
+    assert_response :success
+    assert_match %(<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<user>), response.body
+    assert_no_match(/<confirmation-token/, response.body)
+  end
+
  test 'a user with JSON sign up stub' do
    get new_user_registration_path(format: 'json')
    assert_response :success
@@ -290,49 +297,49 @@ class RegistrationTest < Devise::IntegrationTest
    assert_no_match(/"confirmation_token"/, response.body)
  end

-  test 'an admin sign up with valid information in JSON format should return valid response' do
-    post admin_registration_path(format: 'json'), params: { admin: { email: 'new_user@test.com', password: 'new_user123', password_confirmation: 'new_user123' } }
+  test 'an admin sign up with valid information in XML format should return valid response' do
+    post admin_registration_path(format: 'xml'), params: { admin: { email: 'new_user@test.com', password: 'new_user123', password_confirmation: 'new_user123' } }
    assert_response :success
-    assert_includes response.body, '{"admin":{'
+    assert response.body.include? %(<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<admin>)

    admin = Admin.to_adapter.find_first(order: [:id, :desc])
-    assert_equal 'new_user@test.com', admin.email
+    assert_equal admin.email, 'new_user@test.com'
  end

-  test 'a user sign up with valid information in JSON format should return valid response' do
-    post user_registration_path(format: 'json'), params: { user: { email: 'new_user@test.com', password: 'new_user123', password_confirmation: 'new_user123' } }
+  test 'a user sign up with valid information in XML format should return valid response' do
+    post user_registration_path(format: 'xml'), params: { user: { email: 'new_user@test.com', password: 'new_user123', password_confirmation: 'new_user123' } }
    assert_response :success
-    assert_includes response.body, '{"user":{'
+    assert response.body.include? %(<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<user>)

    user = User.to_adapter.find_first(order: [:id, :desc])
-    assert_equal 'new_user@test.com', user.email
+    assert_equal user.email, 'new_user@test.com'
  end

-  test 'a user sign up with invalid information in JSON format should return invalid response' do
-    post user_registration_path(format: 'json'), params: { user: { email: 'new_user@test.com', password: 'new_user123', password_confirmation: 'invalid' } }
+  test 'a user sign up with invalid information in XML format should return invalid response' do
+    post user_registration_path(format: 'xml'), params: { user: { email: 'new_user@test.com', password: 'new_user123', password_confirmation: 'invalid' } }
    assert_response :unprocessable_entity
-    assert_includes response.body, '{"errors":{'
+    assert response.body.include? %(<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<errors>)
  end

-  test 'a user update information with valid data in JSON format should return valid response' do
+  test 'a user update information with valid data in XML format should return valid response' do
    user = sign_in_as_user
-    put user_registration_path(format: 'json'), params: { user: { current_password: '12345678', email: 'user.new@test.com' } }
+    put user_registration_path(format: 'xml'), params: { user: { current_password: '12345678', email: 'user.new@test.com' } }
    assert_response :success
-    assert_equal 'user.new@test.com', user.reload.email
+    assert_equal user.reload.email, 'user.new@test.com'
  end

-  test 'a user update information with invalid data in JSON format should return invalid response' do
+  test 'a user update information with invalid data in XML format should return invalid response' do
    user = sign_in_as_user
-    put user_registration_path(format: 'json'), params: { user: { current_password: 'invalid', email: 'user.new@test.com' } }
+    put user_registration_path(format: 'xml'), params: { user: { current_password: 'invalid', email: 'user.new@test.com' } }
    assert_response :unprocessable_entity
-    assert_equal 'user@test.com', user.reload.email
+    assert_equal user.reload.email, 'user@test.com'
  end

-  test 'a user cancel their account in JSON format should return valid response' do
+  test 'a user cancel their account in XML format should return valid response' do
    sign_in_as_user
-    delete user_registration_path(format: 'json')
+    delete user_registration_path(format: 'xml')
    assert_response :success
-    assert_equal 0, User.to_adapter.find_all.size
+    assert_equal User.to_adapter.find_all.size, 0
  end
 end

--- a/test/integration/rememberable_test.rb
+++ b/test/integration/rememberable_test.rb
@@ -3,7 +3,7 @@
 require 'test_helper'

 class RememberMeTest < Devise::IntegrationTest
-  def create_user_and_remember(add_to_token = '')
+  def create_user_and_remember(add_to_token='')
    user = create_user
    user.remember_me!
    raw_cookie = User.serialize_into_cookie(user).tap { |a| a[1] << add_to_token }
@@ -14,10 +14,8 @@ class RememberMeTest < Devise::IntegrationTest
  def generate_signed_cookie(raw_cookie)
    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
+      ActionController::TestRequest.create
    end
    request.cookie_jar.signed['raw_cookie'] = raw_cookie
    request.cookie_jar['raw_cookie']
@@ -41,12 +39,12 @@ class RememberMeTest < Devise::IntegrationTest
  test 'handle unverified requests gets rid of caches' do
    swap ApplicationController, allow_forgery_protection: true do
      post exhibit_user_url(1)
-      assert_not warden.authenticated?(:user)
+      refute warden.authenticated?(:user)

      create_user_and_remember
      post exhibit_user_url(1)
      assert_equal "User is not authenticated", response.body
-      assert_not warden.authenticated?(:user)
+      refute warden.authenticated?(:user)
    end
  end

@@ -59,8 +57,8 @@ class RememberMeTest < Devise::IntegrationTest
          authenticity_token: "oops",
          user: { email: "jose.valim@gmail.com", password: "123456", remember_me: "1" }
        }
-      assert_not warden.authenticated?(:user)
-      assert_not request.cookies['remember_user_token']
+      refute warden.authenticated?(:user)
+      refute request.cookies['remember_user_token']
    end
  end

@@ -140,7 +138,7 @@ class RememberMeTest < Devise::IntegrationTest
      get root_path
      current_remember_token = request.cookies['remember_user_token']

-      assert_not_equal old_remember_token, current_remember_token
+      refute_equal old_remember_token, current_remember_token
    end
  end

@@ -166,13 +164,13 @@ class RememberMeTest < Devise::IntegrationTest
    get root_path
    assert_response :success
    assert warden.authenticated?(:user)
-    assert_not warden.authenticated?(:admin)
+    refute warden.authenticated?(:admin)
  end

  test 'do not remember with invalid token' do
    create_user_and_remember('add')
    get users_path
-    assert_not warden.authenticated?(:user)
+    refute warden.authenticated?(:user)
    assert_redirected_to new_user_session_path
  end

@@ -180,7 +178,7 @@ class RememberMeTest < Devise::IntegrationTest
    create_user_and_remember
    swap Devise, remember_for: 0.days do
      get users_path
-      assert_not warden.authenticated?(:user)
+      refute warden.authenticated?(:user)
      assert_redirected_to new_user_session_path
    end
  end
@@ -191,11 +189,11 @@ class RememberMeTest < Devise::IntegrationTest
    assert warden.authenticated?(:user)

    delete destroy_user_session_path
-    assert_not warden.authenticated?(:user)
+    refute warden.authenticated?(:user)
    assert_nil warden.cookies['remember_user_token']

    get users_path
-    assert_not warden.authenticated?(:user)
+    refute warden.authenticated?(:user)
  end

  test 'changing user password expires remember me token' do
@@ -205,7 +203,7 @@ class RememberMeTest < Devise::IntegrationTest
    user.save!

    get users_path
-    assert_not warden.authenticated?(:user)
+    refute warden.authenticated?(:user)
  end

  test 'valid sign in calls after_remembered callback' do
--- a/test/integration/timeoutable_test.rb
+++ b/test/integration/timeoutable_test.rb
@@ -58,7 +58,7 @@ class SessionTimeoutTest < Devise::IntegrationTest

      get users_path
      assert_redirected_to users_path
-      assert_not warden.authenticated?(:user)
+      refute warden.authenticated?(:user)
      assert warden.authenticated?(:admin)
    end
  end
@@ -72,12 +72,12 @@ class SessionTimeoutTest < Devise::IntegrationTest
      assert_not_nil last_request_at

      get root_path
-      assert_not warden.authenticated?(:user)
-      assert_not warden.authenticated?(:admin)
+      refute warden.authenticated?(:user)
+      refute warden.authenticated?(:admin)
    end
  end

-  test 'time out user session after default limit time and redirect to latest get request' do
+  test 'time out user session after deault limit time and redirect to latest get request' do
    user = sign_in_as_user
    visit edit_form_user_path(user)

@@ -109,8 +109,8 @@ class SessionTimeoutTest < Devise::IntegrationTest
    follow_redirect!

    assert_response :success
-    assert_contain 'Log in'
-    assert_not warden.authenticated?(:user)
+    assert_contain 'Sign in'
+    refute warden.authenticated?(:user)
  end

  test 'time out is not triggered on sign in' do
@@ -136,7 +136,7 @@ class SessionTimeoutTest < Devise::IntegrationTest
      get expire_user_path(user)
      get users_path
      assert_redirected_to users_path
-      assert_not warden.authenticated?(:user)
+      refute warden.authenticated?(:user)
    end
  end

--- a/test/integration/trackable_test.rb
+++ b/test/integration/trackable_test.rb
@@ -6,7 +6,7 @@ class TrackableHooksTest < Devise::IntegrationTest
  test "trackable should not run model validations" do
    sign_in_as_user

-    assert_not User.validations_performed
+    refute User.validations_performed
  end

  test "current and last sign in timestamps are updated on each sign in" do
@@ -44,7 +44,7 @@ class TrackableHooksTest < Devise::IntegrationTest
    assert_equal "127.0.0.1", user.last_sign_in_ip
  end

-  test "current and last sign in remote ip returns original ip behind a non transparent proxy" do
+  test "current remote ip returns original ip behind a non transparent proxy" do
    user = create_user

    arbitrary_ip = '200.121.1.69'
@@ -53,7 +53,6 @@ class TrackableHooksTest < Devise::IntegrationTest
    end
    user.reload
    assert_equal arbitrary_ip, user.current_sign_in_ip
-    assert_equal arbitrary_ip, user.last_sign_in_ip
  end

  test "increase sign in count" do
@@ -96,5 +95,4 @@ class TrackableHooksTest < Devise::IntegrationTest
    user.reload
    assert_equal 1, user.sign_in_count
  end
-
 end
--- a/test/mailers/confirmation_instructions_test.rb
+++ b/test/mailers/confirmation_instructions_test.rb
@@ -31,7 +31,7 @@ class ConfirmationInstructionsTest < ActionMailer::TestCase
  end

  test 'content type should be set to html' do
-    assert_includes mail.content_type, 'text/html'
+    assert mail.content_type.include?('text/html')
  end

  test 'send confirmation instructions to the user email' do
@@ -88,7 +88,7 @@ class ConfirmationInstructionsTest < ActionMailer::TestCase
    host, port = ActionMailer::Base.default_url_options.values_at :host, :port

    if mail.body.encoded =~ %r{<a href=\"http://#{host}:#{port}/users/confirmation\?confirmation_token=([^"]+)">}
-      assert_equal user.confirmation_token, $1
+      assert_equal $1, user.confirmation_token
    else
      flunk "expected confirmation url regex to match"
    end
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Marcos Ferreira	4be9389dcb	Merge pull request #5032 from JanBussieck/pure-signed_in-method Use warden’s `authenticated?` for query methods to avoid side effects	2019-09-19 14:32:41 -03:00
Jan Bussieck	2fde07b9be	Fix test case descriptions, since we are testing proxying to 'authenticated?'	2019-09-19 17:18:02 +02:00
Jan Bussieck	70c5f4bfaf	Use warden’s `authenticated?` for query methods to avoid side effects Previously checks whether a certain scope is signed in were performed using warden’s `authenticate?` or `authenticate` methods which would run the strategies and sign in the scope if valid params were given. We want to remove this side effect from query methods.	2019-09-19 17:18:02 +02:00
Jeremy Wadsack	0a2e67878a	When password reset token expires, redirect to new password path (#4837 )	2019-09-19 10:22:30 -03:00
Leonardo Tegon	c381c916f3	Remove circular argument reference /Users/tegon/src/public/plataformatec/devise/app/controllers/devise/sessions_controller.rb:75: warning: circular argument reference - status	2019-09-19 10:22:30 -03:00
Felipe Renan	9999072620	Update CHANGELOG.md [ci skip]	2019-09-19 10:22:30 -03:00
Marc Busqué	34238e9f18	Update trackable fields only in a database sign in References #4584 and waiting-for-dev/devise-jwt#23 * Bug Users that use devise-jwt, will not have the correct behavior of trackable feature. As a request for APIs always requires authentication since there is no session in APIs world, Devise counts +1 on every request since it contains authentication info. It happens because Devise has a trackable hook that updates the trackable info everytime that the user is signed in by Warden. * Fix We are moving update_trackable_fields! from trackable hook (which was removed) to sign_in_out and database_authenticatable. This way, update_trackable_fields! is going to run only when the user signed in by Devise (only one time).	2019-09-19 10:22:29 -03:00
Felipe Renan	a1c493b009	Remove unnecessary checks for Rails 4	2019-09-19 10:22:29 -03:00
Felipe Renan	e7f9805fd4	Update CHANGELOG.md	2019-09-19 10:22:29 -03:00
Felipe Renan	8956d4caa1	Remove Ruby 2.2 and Ruby 2.1 support	2019-09-19 10:22:29 -03:00
Julius Graakjær Grantzau	b85911dee3	Downcase authentication keys and humanize error message (#4834 )	2019-09-19 10:21:02 -03:00
Felipe Renan	2d1a961c1b	Remove Rails 4 support	2019-09-19 10:20:59 -03:00
Adan Amarillas	195cbfb9e5	Modified sessions controller to return 401 for destroy action with no user signed in (#4878 )	2019-09-19 10:06:14 -03:00
Leonardo Tegon	96a3153c23	Update `CHANGELOG.md`	2019-09-19 10:06:14 -03:00
Shriram	64238fc80e	Make secure_compare handle empty strings comparison correctly Used Rails' secure_compare method inside the definition of secure_compare. This will handle the empty strings comparison and return true when both the parameters are blank strings. Fixes #4441	2019-09-19 10:06:14 -03:00
Siva Gollapalli	afaad713ff	Added translations according to unlock strategy	2019-09-19 10:06:13 -03:00