Test with mongoid

2026-01-11 08:37:56 -05:00 · 2017-05-11 19:23:23 -07:00
240 changed files with 991 additions and 3438 deletions
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,19 +2,13 @@ language: ruby

 rvm:
  - 2.1.10
-  - 2.2.10
-  - 2.3.8
-  - 2.4.10
-  - 2.5.8
-  - 2.6.6
-  - 2.7.1
+  - 2.2.7
+  - 2.3.4
+  - 2.4.1
  - ruby-head

 gemfile:
  - Gemfile
-  - gemfiles/Gemfile.rails-6.0-stable
-  - gemfiles/Gemfile.rails-5.2-stable
-  - gemfiles/Gemfile.rails-5.1-stable
  - gemfiles/Gemfile.rails-5.0-stable
  - gemfiles/Gemfile.rails-4.2-stable
  - gemfiles/Gemfile.rails-4.1-stable
@@ -23,68 +17,21 @@ matrix:
  exclude:
    - rvm: 2.1.10
      gemfile: Gemfile
-    - rvm: 2.1.10
-      gemfile: gemfiles/Gemfile.rails-6.0-stable
-    - rvm: 2.1.10
-      gemfile: gemfiles/Gemfile.rails-5.2-stable
-    - rvm: 2.1.10
-      gemfile: gemfiles/Gemfile.rails-5.1-stable
-    - rvm: 2.1.10
-      gemfile: gemfiles/Gemfile.rails-5.0-stable
-    - rvm: 2.2.10
-      gemfile: Gemfile
-    - rvm: 2.2.10
-      gemfile: gemfiles/Gemfile.rails-6.0-stable
-    - rvm: 2.2.10
-      gemfile: gemfiles/Gemfile.rails-5.2-stable
-    - rvm: 2.3.8
-      gemfile: Gemfile
-    - rvm: 2.3.8
-      gemfile: gemfiles/Gemfile.rails-6.0-stable
-    - rvm: 2.4.10
-      gemfile: Gemfile
-    - rvm: 2.4.10
-      gemfile: gemfiles/Gemfile.rails-6.0-stable
-    - rvm: 2.4.10
-      gemfile: gemfiles/Gemfile.rails-4.1-stable
-    - rvm: 2.5.8
-      gemfile: gemfiles/Gemfile.rails-4.1-stable
-    - rvm: 2.6.6
-      gemfile: gemfiles/Gemfile.rails-4.1-stable
-    - rvm: 2.6.6
-      gemfile: gemfiles/Gemfile.rails-4.2-stable
-    - rvm: 2.7.1
-      gemfile: gemfiles/Gemfile.rails-4.1-stable
-    - rvm: 2.7.1
-      gemfile: gemfiles/Gemfile.rails-4.1-stable
-    - rvm: 2.7.1
-      gemfile: gemfiles/Gemfile.rails-4.2-stable
-    - rvm: 2.7.1
-      gemfile: gemfiles/Gemfile.rails-5.0-stable
-    - rvm: 2.7.1
-      gemfile: gemfiles/Gemfile.rails-5.1-stable
-    - rvm: 2.7.1
-      gemfile: gemfiles/Gemfile.rails-5.2-stable
-    - rvm: ruby-head
+    - rvm: 2.4.1
      gemfile: gemfiles/Gemfile.rails-4.1-stable
    - rvm: ruby-head
-      gemfile: gemfiles/Gemfile.rails-4.2-stable
-    - env: DEVISE_ORM=mongoid
-      gemfile: Gemfile
-    - env: DEVISE_ORM=mongoid
+      gemfile: gemfiles/Gemfile.rails-4.1-stable
+    - rvm: 2.1.10
      gemfile: gemfiles/Gemfile.rails-5.0-stable
-    - env: DEVISE_ORM=mongoid
-      gemfile: gemfiles/Gemfile.rails-5.1-stable
-    - env: DEVISE_ORM=mongoid
-      gemfile: gemfiles/Gemfile.rails-5.2-stable
-    - env: DEVISE_ORM=mongoid
-      gemfile: gemfiles/Gemfile.rails-6.0-stable
+    - rvm: 2.1.10
+      gemfile: Gemfile
  allow_failures:
    - rvm: ruby-head
-
 services:
  - mongodb

+sudo: false
+
 cache: bundler

 env:
@@ -92,10 +39,7 @@ env:
    - DEVISE_ORM=active_record
    - DEVISE_ORM=mongoid

-before_install:
-  - gem uninstall -v '>= 2' -i $(rvm gemdir)@global -ax bundler || true
-  - gem install bundler -v '< 2'
-  - "rm ${BUNDLE_GEMFILE}.lock"
+before_install: "rm ${BUNDLE_GEMFILE}.lock"

 before_script: "bundle update"

--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,145 +1,4 @@
-### 4.7.3 - 2020-09-20
-
-* bug fixes
-  * Do not modify `:except` option given to `#serializable_hash`. (by @dpep)
-  * Fix thor deprecation when running the devise generator. (by @deivid-rodriguez)
-  * Fix hanging tests for streaming controllers using Devise. (by @afn)
-
-### 4.7.2 - 2020-06-10
-
-* enhancements
-  * Increase default stretches to 12 (by @sergey-alekseev)
-  * Ruby 2.7 support (kwarg warnings removed)
-
-* bug fixes
-  * Generate scoped views with proper scoped errors partial (by @shobhitic)
-  * Allow to set scoped `already_authenticated` error messages (by @gurgelrenan)
-
-### 4.7.1 - 2019-09-06
-
-* bug fixes
-  * Fix an edge case where records with a blank `confirmation_token` could be confirmed (by @tegon)
-  * Fix typo inside `update_needs_confirmation` i18n key (by @lslm)
-
-### 4.7.0 - 2019-08-19
-
-* enhancements
-  * Support Rails 6.0
-  * Update CI to rails 6.0.0.beta3 (by @tunnes)
-  * refactor method name to be more consistent (by @saiqulhaq)
-  * Fix rails 6.0.rc1 email uniqueness validation deprecation warning (by @Vasfed)
-
-* bug fixes
-  * Add `autocomplete="new-password"` to `password_confirmation` fields (by @ferrl)
-  * Fix rails_51_and_up? method for Rails 6.rc1 (by @igorkasyanchuk)
-
-### 4.6.2 - 2019-03-26
-
-* bug fixes
-  * Revert "Set `encrypted_password` to `nil` when `password` is set to `nil`" since it broke backward compatibility with existing applications. See more on https://github.com/heartcombo/devise/issues/5033#issuecomment-476386275 (by @mracos)
-
-### 4.6.1 - 2019-02-11
-
-* bug fixes
-  * Check if `root_path` is defined with `#respond_to?` instead of `#present` (by @tegon)
-
-### 4.6.0 - 2019-02-07
-
-* enhancements
-  * Allow to skip email and password change notifications (by @iorme1)
-  * Include the use of `nil` for `allow_unconfirmed_access_for` in the docs (by @joaumg)
-  * Ignore useless files into the `.gem` file (by @huacnlee)
-  * Explain the code that prevents enumeration attacks inside `Devise::Strategies::DatabaseAuthenticatable` (by @tegon)
-  * Refactor the `devise_error_messages!` helper to render a partial (by @prograhamer)
-  * Add an option (`Devise.sign_in_after_change_password`) to not automatically sign in a user after changing a password (by @knjko)
-
-* bug fixes
-  * Fix missing comma in Simple Form generator (by @colinross)
-  * Fix error with migration generator in Rails 6 (by @oystersauce8)
-  * Set `encrypted_password` to `nil` when `password` is set to `nil` (by @sivagollapalli)
-  * Consider whether the request supports flash messages inside `Devise::Controllers::Helpers#is_flashing_format?` (by @colinross)
-  * Fix typo inside `Devise::Generators::ControllersGenerator` (by @kopylovvlad)
-  * Sanitize parameters inside `Devise::Models::Authenticatable#find_or_initialize_with_errors` (by @rlue)
-  * `#after_database_authentication` callback was not called after authentication on password reset (by @kanmaniselvan)
-  * Fix corner case when `#confirmation_period_valid?` was called at the same second as `confirmation_sent_at` was set. Mostly true for date types that only have second precisions. (by @stanhu)
-  * Fix unclosed `li` tag in `error_messages` partial (by @mracos)
-  * Fix Routes issue when devise engine is mounted in another engine on Rails versions lower than 5.1 (by @a-barbieri)
-  * Make `#increment_failed_attempts` concurrency safe (by @tegon)
-  * Apply Test Helper fix to Rails 6.0 as well as 5.x (by @matthewrudy)
-
-
-* deprecations
-  * The second argument of `DatabaseAuthenticatable`'s `#update_with_password` and `#update_without_password` is deprecated and will be removed in the next major version. It was added to support a feature deprecated in Rails 4, so you can safely remove it from your code. (by @ihatov08)
-  * The `DeviseHelper.devise_error_messages!` is deprecated and will be removed in the next major version. Use the `devise/shared/error_messages` partial instead. (by @mracos)
-
-### 4.5.0 - 2018-08-15
-
-* enhancements
-  * Use `before_action` instead of `before_filter` (by @edenthecat)
-  *  Allow people to extend devise failure app, through invoking `ActiveSupport.run_load_hooks` once `Devise::FailureApp` is loaded (by @wnm)
-  * Use `update` instead of `update_attributes` (by @koic)
-  * Split IP resolution from `update_tracked_fields` (by @mckramer)
-  * upgrade dependencies for rails and responders (by @lancecarlson)
-  * Add `autocomplete="new-password"` to new password fields (by @gssbzn)
-  * Add `autocomplete="current-password"` to current password fields (by @gssbzn)
-  * Remove redundant `self` from `database_authenticatable` module (by @abhishekkanojia)
-  * Update `simple_form` templates with changes from https://github.com/heartcombo/devise/commit/16b3d6d67c7e017d461ea17ed29ea9738dc77e83 and https://github.com/heartcombo/devise/commit/6260c29a867b9a656f1e1557abe347a523178fab (by @gssbzn)
-  * Remove `:trackable` from the default modules in the generators, to be more GDPR-friendly (by @fakenine)
-
-* bug fixes
-  * Use same string on failed login regardless of whether account exists when in paranoid mode (by @TonyMK9068)
-  * Fix error when params is not a hash inside `Devise::ParameterSanitizer` (by @b0nn1e)
-  * Look for `secret_key_base` inside `Rails.application` (by @gencer)
-  * Ensure `Devise::ParameterFilter` does not add missing keys when called with a hash that has a `default` / `default_proc`
-configured (by @joshpencheon)
-  * Adds `is_navigational_format?` check to `after_sign_up_path_for` to keep consistency (by @iorme1)
-
-### 4.4.3 - 2018-03-17
-
-* bug fixes
-  * Fix undefined method `rails5?` for Devise::Test:Module (by @tegon)
-  * Fix: secret key was being required to be set inside credentials on Rails 5.2 (by @tegon)
-
-### 4.4.2 - 2018-03-15
-
-* enhancements
-  * Support for :credentials on Rails v5.2.x. (by @gencer)
-  * Improve documentation about the test suite. (by @tegon)
-  * Test with Rails 5.2.rc1 on Travis. (by @jcoyne)
-  * Allow test with Rails 6. (by @Fudoshiki)
-  * Creating a new section for controller configuration on `devise.rb` template (by @Danilo-Araujo-Silva)
-
-* bug fixes
-  * Preserve content_type for unauthenticated tests (by @gmcnaughton)
-  * Check if the resource is persisted in `update_tracked_fields!` instead of performing validations (by @tegon)
-  * Revert "Replace log_process_action to append_info_to_payload" (by @tegon)
-
-### 4.4.1 - 2018-01-23
-
-* bug fixes
-  * Ensure Gemspec is loaded as utf-8. (by @segiddins)
-  * Fix `ActiveRecord` check on `Confirmable`. (by @tegon)
-  * Fix `signed_in?` docs without running auth hooks. by (@machty)
-
-### 4.4.0 - 2017-12-29
-
-* enhancements
-  * Add `frozen_string_literal` pragma comment to all Ruby files. (by @pat)
-  * Use `set_flash_method!` instead of `set_flash_method` in `Devise::OmniauthCallbacksController#failure`. (by @saichander17)
-  * Clarify how `store_location_for` modifies URIs. (by @olivierlacan)
-  * Move `failed_attempts` increment into its own function. by (@mobilutz)
-  * Add `autocomplete="email"` to email fields. by (@MikeRogers0)
-  * Add the ability to change the default migrations path introduced in Rails 5.0.3.  (by @alexhifer)
-  * Delete unnecessary condition for helper method. (by @davydovanton)
-  * Support `id: :uuid` option for migrations. (by @filip373)
-
-* bug fixes
-  * Fix syntax for MRI 2.5.0. (by @pat)
-  * Validations were being ignored on singup in the `Trackable#update_tracked_fields!` method. (by @AshleyFoster)
-  * Do not modify options for `#serializable_hash`. (by @guigs)
-  * Email confirmations were being sent on sign in/sign out for application using `mongoid` and `mongoid-paperclip` gems. This is because previously we were checking if a model is from Active Record by checking if the method `after_commit` was defined - since `mongoid` doesn' have one - but `mongoid-paperclip` gem does define one, which cause this issue. (by @fjg)
-
-### 4.3.0 - 2017-05-14
+### 4.3.0 - unreleased

 * Enhancements
  * Dependency support added for Rails 5.1.x.
@@ -327,8 +186,8 @@ configured (by @joshpencheon)
    end
    ```

-    You can check more examples and explanations on the [README section](README.md#strong-parameters)
+    You can check more examples and explanations on the [README section](/plataformatec/devise#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
@@ -64,9 +64,9 @@ open issues to help troubleshoot and fix existing bugs on Devise. Here is what
 you can do:

 * Help ensure that existing issues follows the recommendations from the
-_[Reporting Issues](#reporting-issues)_ section, providing feedback to the issue's
+_[Reporting Issues](#reporting-issues)_ section, providing feeback 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/36
+++ b/36
@@ -1,39 +1,39 @@
-# frozen_string_literal: true
-
 source "https://rubygems.org"

 gemspec

-gem "rails", "~> 6.0.0"
-gem "omniauth"
+gem "rails", "~> 5.1"
+gem "omniauth", "~> 1.3"
+gem "oauth2"
 gem "omniauth-oauth2"
 gem "rdoc"

 gem "activemodel-serializers-xml", github: "rails/activemodel-serializers-xml"

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

-gem "responders", "~> 3.0"
+gem "responders", "~> 2.1"
+
+# TODO: Remove this line when Rails 5.1.1 is released
+gem "minitest", "< 5.10.2"

 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.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"
+end

-# TODO:
-# group :mongoid do
-#   gem "mongoid", "~> 4.0.0"
-# end
+group :mongoid do
+  gem "mongoid"
+end
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,219 +1,201 @@
 GIT
-  remote: https://github.com/rails/activemodel-serializers-xml.git
-  revision: 694f4071c6b16e4c8597cc323c241b5f787b3ea8
+  remote: git://github.com/rails/activemodel-serializers-xml.git
+  revision: dd9c0acf26aab111ebc647cd8deb99ebc6946531
  specs:
-    activemodel-serializers-xml (1.0.2)
-      activemodel (>= 5.0.0.a)
-      activesupport (>= 5.0.0.a)
+    activemodel-serializers-xml (1.0.1)
+      activemodel (> 5.x)
+      activesupport (> 5.x)
      builder (~> 3.1)

-GIT
-  remote: https://github.com/rails/rails-controller-testing.git
-  revision: 4b15c86e82ee380f2a7cc009e470368f7520560a
-  specs:
-    rails-controller-testing (1.0.5)
-      actionpack (>= 5.0.1.rc1)
-      actionview (>= 5.0.1.rc1)
-      activesupport (>= 5.0.1.rc1)
-
 PATH
  remote: .
  specs:
-    devise (4.7.3)
+    devise (4.3.0)
      bcrypt (~> 3.0)
      orm_adapter (~> 0.1)
-      railties (>= 4.1.0)
+      railties (>= 4.1.0, < 5.2)
      responders
      warden (~> 1.2.3)

 GEM
  remote: https://rubygems.org/
  specs:
-    actioncable (6.0.3.3)
-      actionpack (= 6.0.3.3)
+    actioncable (5.1.0)
+      actionpack (= 5.1.0)
      nio4r (~> 2.0)
-      websocket-driver (>= 0.6.1)
-    actionmailbox (6.0.3.3)
-      actionpack (= 6.0.3.3)
-      activejob (= 6.0.3.3)
-      activerecord (= 6.0.3.3)
-      activestorage (= 6.0.3.3)
-      activesupport (= 6.0.3.3)
-      mail (>= 2.7.1)
-    actionmailer (6.0.3.3)
-      actionpack (= 6.0.3.3)
-      actionview (= 6.0.3.3)
-      activejob (= 6.0.3.3)
+      websocket-driver (~> 0.6.1)
+    actionmailer (5.1.0)
+      actionpack (= 5.1.0)
+      actionview (= 5.1.0)
+      activejob (= 5.1.0)
      mail (~> 2.5, >= 2.5.4)
      rails-dom-testing (~> 2.0)
-    actionpack (6.0.3.3)
-      actionview (= 6.0.3.3)
-      activesupport (= 6.0.3.3)
-      rack (~> 2.0, >= 2.0.8)
-      rack-test (>= 0.6.3)
+    actionpack (5.1.0)
+      actionview (= 5.1.0)
+      activesupport (= 5.1.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.3.3)
-      actionpack (= 6.0.3.3)
-      activerecord (= 6.0.3.3)
-      activestorage (= 6.0.3.3)
-      activesupport (= 6.0.3.3)
-      nokogiri (>= 1.8.5)
-    actionview (6.0.3.3)
-      activesupport (= 6.0.3.3)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    actionview (5.1.0)
+      activesupport (= 5.1.0)
      builder (~> 3.1)
      erubi (~> 1.4)
      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activejob (6.0.3.3)
-      activesupport (= 6.0.3.3)
+      rails-html-sanitizer (~> 1.0, >= 1.0.3)
+    activejob (5.1.0)
+      activesupport (= 5.1.0)
      globalid (>= 0.3.6)
-    activemodel (6.0.3.3)
-      activesupport (= 6.0.3.3)
-    activerecord (6.0.3.3)
-      activemodel (= 6.0.3.3)
-      activesupport (= 6.0.3.3)
-    activestorage (6.0.3.3)
-      actionpack (= 6.0.3.3)
-      activejob (= 6.0.3.3)
-      activerecord (= 6.0.3.3)
-      marcel (~> 0.3.1)
-    activesupport (6.0.3.3)
+    activemodel (5.1.0)
+      activesupport (= 5.1.0)
+    activerecord (5.1.0)
+      activemodel (= 5.1.0)
+      activesupport (= 5.1.0)
+      arel (~> 8.0)
+    activesupport (5.1.0)
      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
+      i18n (~> 0.7)
      minitest (~> 5.1)
      tzinfo (~> 1.1)
-      zeitwerk (~> 2.2, >= 2.2.2)
-    bcrypt (3.1.16)
-    builder (3.2.4)
-    concurrent-ruby (1.1.7)
-    crass (1.0.6)
-    erubi (1.9.0)
-    faraday (1.0.1)
+    arel (8.0.0)
+    bcrypt (3.1.11)
+    bson (4.2.1)
+    builder (3.2.3)
+    concurrent-ruby (1.0.5)
+    erubi (1.6.0)
+    faraday (0.11.0)
      multipart-post (>= 1.2, < 3)
-    globalid (0.4.2)
+    globalid (0.4.0)
      activesupport (>= 4.2.0)
-    hashie (4.1.0)
-    i18n (1.8.5)
-      concurrent-ruby (~> 1.0)
-    jwt (2.2.2)
-    loofah (2.7.0)
-      crass (~> 1.0.2)
+    hashie (3.5.5)
+    i18n (0.8.1)
+    jwt (1.5.6)
+    loofah (2.0.3)
      nokogiri (>= 1.5.9)
-    mail (2.7.1)
-      mini_mime (>= 0.1.1)
-    marcel (0.3.3)
-      mimemagic (~> 0.3.2)
-    method_source (1.0.0)
-    mimemagic (0.3.5)
-    mini_mime (1.0.2)
-    mini_portile2 (2.4.0)
-    minitest (5.14.2)
-    mocha (1.11.2)
-    multi_json (1.15.0)
+    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)
+    mongo (2.4.1)
+      bson (>= 4.2.1, < 5.0.0)
+    mongoid (6.1.0)
+      activemodel (~> 5.0)
+      mongo (>= 2.4.1, < 3.0.0)
+    multi_json (1.12.1)
    multi_xml (0.6.0)
-    multipart-post (2.1.1)
-    nio4r (2.5.4)
-    nokogiri (1.10.10)
-      mini_portile2 (~> 2.4.0)
-    oauth2 (1.4.4)
-      faraday (>= 0.8, < 2.0)
-      jwt (>= 1.0, < 3.0)
+    multipart-post (2.0.0)
+    nio4r (2.0.0)
+    nokogiri (1.7.1)
+      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.9.1)
-      hashie (>= 3.4.6)
+    omniauth (1.6.1)
+      hashie (>= 3.4.6, < 3.6.0)
      rack (>= 1.6.2, < 3)
-    omniauth-facebook (7.0.0)
+    omniauth-facebook (4.0.0)
      omniauth-oauth2 (~> 1.2)
-    omniauth-oauth2 (1.7.0)
-      oauth2 (~> 1.4)
-      omniauth (~> 1.9)
+    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.2.3)
+    rack (2.0.1)
    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.3.3)
-      actioncable (= 6.0.3.3)
-      actionmailbox (= 6.0.3.3)
-      actionmailer (= 6.0.3.3)
-      actionpack (= 6.0.3.3)
-      actiontext (= 6.0.3.3)
-      actionview (= 6.0.3.3)
-      activejob (= 6.0.3.3)
-      activemodel (= 6.0.3.3)
-      activerecord (= 6.0.3.3)
-      activestorage (= 6.0.3.3)
-      activesupport (= 6.0.3.3)
-      bundler (>= 1.3.0)
-      railties (= 6.0.3.3)
+    rack-test (0.6.3)
+      rack (>= 1.0)
+    rails (5.1.0)
+      actioncable (= 5.1.0)
+      actionmailer (= 5.1.0)
+      actionpack (= 5.1.0)
+      actionview (= 5.1.0)
+      activejob (= 5.1.0)
+      activemodel (= 5.1.0)
+      activerecord (= 5.1.0)
+      activesupport (= 5.1.0)
+      bundler (>= 1.3.0, < 2.0)
+      railties (= 5.1.0)
      sprockets-rails (>= 2.0.0)
-    rails-dom-testing (2.0.3)
-      activesupport (>= 4.2.0)
-      nokogiri (>= 1.6)
-    rails-html-sanitizer (1.3.0)
-      loofah (~> 2.3)
-    railties (6.0.3.3)
-      actionpack (= 6.0.3.3)
-      activesupport (= 6.0.3.3)
+    rails-controller-testing (1.0.1)
+      actionpack (~> 5.x)
+      actionview (~> 5.x)
+      activesupport (~> 5.x)
+    rails-dom-testing (2.0.2)
+      activesupport (>= 4.2.0, < 6.0)
+      nokogiri (~> 1.6)
+    rails-html-sanitizer (1.0.3)
+      loofah (~> 2.0)
+    railties (5.1.0)
+      actionpack (= 5.1.0)
+      activesupport (= 5.1.0)
      method_source
      rake (>= 0.8.7)
-      thor (>= 0.20.3, < 2.0)
-    rake (13.0.1)
-    rdoc (6.2.1)
-    responders (3.0.1)
-      actionpack (>= 5.0)
-      railties (>= 5.0)
-    ruby-openid (2.9.2)
-    sprockets (4.0.2)
+      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.2)
+    sprockets-rails (3.2.0)
      actionpack (>= 4.0)
      activesupport (>= 4.0)
      sprockets (>= 3.0.0)
-    sqlite3 (1.4.2)
-    thor (1.0.1)
+    sqlite3 (1.3.13)
+    thor (0.19.4)
    thread_safe (0.3.6)
-    timecop (0.9.1)
-    tzinfo (1.2.7)
+    tzinfo (1.2.3)
      thread_safe (~> 0.1)
-    warden (1.2.9)
-      rack (>= 2.0.9)
+    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.3)
+    websocket-driver (0.6.5)
      websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.5)
-    zeitwerk (2.4.0)
+    websocket-extensions (0.1.2)

 PLATFORMS
  ruby

 DEPENDENCIES
  activemodel-serializers-xml!
+  activerecord-jdbc-adapter
+  activerecord-jdbcsqlite3-adapter
  devise!
+  jruby-openssl
+  minitest (< 5.10.2)
  mocha (~> 1.1)
-  omniauth
+  mongoid
+  oauth2
+  omniauth (~> 1.3)
  omniauth-facebook
  omniauth-oauth2
  omniauth-openid
-  rails (~> 6.0.0)
-  rails-controller-testing!
+  rails (~> 5.1)
+  rails-controller-testing
  rdoc
-  responders (~> 3.0)
-  sqlite3 (~> 1.4)
-  timecop
+  responders (~> 2.1)
+  sqlite3
  webrat (= 0.7.3)

 BUNDLED WITH
-   1.17.3
+   1.14.6
--- a/ISSUE_TEMPLATE.md
+++ b/ISSUE_TEMPLATE.md
@@ -1,20 +0,0 @@
-## Pre-check
-
- 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.
- Finally, be nice and have fun!
-
-## Environment
-
- Ruby **[version]**
- Rails **[version]**
- Devise **[version]**
-
-## Current behavior
-
-Include code samples, errors, steps to reproduce the error and stack traces if appropriate.
-
-Will be even more helpful if you provide a sample application or a test case that reproduces the error.
-
-## Expected behavior
--- a/3
+++ b/3
@@ -1,5 +1,4 @@
-Copyright 2020 Rafael França, Leonardo Tegon, Carlos Antônio da Silva.
-Copyright 2009-2019 Plataformatec.
+Copyright 2009-2017 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,7 +1,11 @@
-![Devise Logo](https://raw.github.com/heartcombo/devise/master/devise.png)
+![Devise Logo](https://raw.github.com/plataformatec/devise/master/devise.png)

-[![Build Status](https://api.travis-ci.org/heartcombo/devise.svg?branch=master)](http://travis-ci.org/heartcombo/devise)
-[![Code Climate](https://codeclimate.com/github/heartcombo/devise.svg)](https://codeclimate.com/github/heartcombo/devise)
+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:

@@ -12,55 +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/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/heartcombo/devise/master/Devise/Models/Omniauthable): adds OmniAuth (https://github.com/omniauth/omniauth) support.
-* [Confirmable](http://www.rubydoc.info/github/heartcombo/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/heartcombo/devise/master/Devise/Models/Recoverable): resets the user password and sends reset instructions.
-* [Registerable](http://www.rubydoc.info/github/heartcombo/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/heartcombo/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/heartcombo/devise/master/Devise/Models/Trackable): tracks sign in count, timestamps and IP address.
-* [Timeoutable](http://www.rubydoc.info/github/heartcombo/devise/master/Devise/Models/Timeoutable): expires sessions that have not been active in a specified period of time.
-* [Validatable](http://www.rubydoc.info/github/heartcombo/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/heartcombo/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
-
-<!-- TOC depthFrom:1 depthTo:6 withLinks:1 orderedList:0 -->
-
- [Information](#information)
-	- [The Devise wiki](#the-devise-wiki)
-	- [Bug reports](#bug-reports)
-	- [StackOverflow and Mailing List](#stackoverflow-and-mailing-list)
-	- [RDocs](#rdocs)
-	- [Example applications](#example-applications)
-	- [Extensions](#extensions)
-	- [Contributing](#contributing)
- [Starting with Rails?](#starting-with-rails)
- [Getting started](#getting-started)
-	- [Controller filters and helpers](#controller-filters-and-helpers)
-	- [Configuring Models](#configuring-models)
-	- [Strong Parameters](#strong-parameters)
-	- [Configuring views](#configuring-views)
-	- [Configuring controllers](#configuring-controllers)
-	- [Configuring routes](#configuring-routes)
-	- [I18n](#i18n)
-	- [Test helpers](#test-helpers)
-	- [Controller tests](#controller-tests)
-	- [Integration tests](#integration-tests)
-	- [OmniAuth](#omniauth)
-	- [Configuring multiple models](#configuring-multiple-models)
-	- [ActiveJob Integration](#activejob-integration)
-	- [Password reset tokens and Rails logs](#password-reset-tokens-and-rails-logs)
-	- [Other ORMs](#other-orms)
-	- [Rails API mode](#rails-api-mode)
- [Additional information](#additional-information)
-	- [Warden](#warden)
-	- [Contributors](#contributors)
- [License](#license)
-
-<!-- /TOC -->
-
-
+* [Database Authenticatable](http://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://rubydoc.info/github/plataformatec/devise/master/Devise/Models/Omniauthable): adds OmniAuth (https://github.com/omniauth/omniauth) support.
+* [Confirmable](http://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://rubydoc.info/github/plataformatec/devise/master/Devise/Models/Recoverable): resets the user password and sends reset instructions.
+* [Registerable](http://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://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://rubydoc.info/github/plataformatec/devise/master/Devise/Models/Trackable): tracks sign in count, timestamps and IP address.
+* [Timeoutable](http://rubydoc.info/github/plataformatec/devise/master/Devise/Models/Timeoutable): expires sessions that have not been active in a specified period of time.
+* [Validatable](http://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://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.

 ## Information

@@ -68,15 +33,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

@@ -92,7 +57,7 @@ https://groups.google.com/group/plataformatec-devise

 You can view the Devise documentation in RDoc format here:

-http://rubydoc.info/github/heartcombo/devise/master/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.

@@ -100,82 +65,35 @@ 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 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
-
-==> Devise.orm = :mongoid
-```
-When running the tests for Mongoid, you will need to have a MongoDB server (version 2.0 or newer) running on your system.
-
-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/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.4.2 and Rails 4.1, 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
-```
-
-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
-```
-
-### Running tests
-Devise uses [Mini Test](https://github.com/seattlerb/minitest) as test framework.
-
-* Running all tests:
-```bash
-bin/test
-```
-
-* Running tests for an specific file:
-```bash
-bin/test test/models/trackable_test.rb
-```
-
-* Running a specific test given a regex:
-```bash
-bin/test test/models/trackable_test.rb:16
-```
+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 "rake".  For the tests to pass, you will need to have a MongoDB server (version 2.0 or newer) running on your system.

 ## 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
-* Codecademy's Ruby on Rails: Authentication and Authorization: https://www.codecademy.com/learn/rails-auth
+* Ryan Bates' Railscast: http://railscasts.com/episodes/250-authentication-from-scratch
+* Codecademy's Ruby on Rails: Authentication and Authorization: http://www.codecademy.com/en/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 4.0 works with Rails 4.1 onwards. You can add it to your Gemfile with:

 ```ruby
 gem 'devise'
@@ -204,11 +122,11 @@ In the following command you will replace `MODEL` with the class name used for t
 $ rails generate devise MODEL
 ```

-Next, check the MODEL for any additional configuration options you might want to add, such as confirmable or lockable. If you add an option, be sure to inspect the migration file (created by the generator if your ORM supports them) and uncomment the appropriate section.  For example, if you add the confirmable option in the model, you'll need to uncomment the Confirmable section in the migration.
+Next, check the MODEL for any additional configuration options you might want to add, such as confirmable or lockable. If you add an option, be sure to inspect the migration file (created by the generator if your ORM supports them) and uncomment the appropriate section.  For example, if you add the confirmable option in the model, you'll need to uncomment the Confirmable section in the migration. 

 Then run `rails db:migrate`

-You should restart your application after changing Devise's configuration options (this includes stopping spring). Otherwise, you will run into strange errors, for example, users being unable to login and route helpers being undefined.
+You should restart your application after changing Devise's configuration options. Otherwise, you will run into strange errors, for example, users being unable to login and route helpers being undefined.

 ### Controller filters and helpers

@@ -265,16 +183,16 @@ member_session
 The Devise method in your models also accepts some options to configure its modules. For example, you can choose the cost of the hashing algorithm with:

 ```ruby
-devise :database_authenticatable, :registerable, :confirmable, :recoverable, stretches: 13
+devise :database_authenticatable, :registerable, :confirmable, :recoverable, stretches: 12
 ```

 Besides `:stretches`, you can define `:pepper`, `:encryptor`, `:confirm_within`, `:remember_for`, `:timeout_in`, `:unlock_in` among other options. For more details, see the initializer file that was created when you invoked the "devise:install" generator described above. This file is usually located at `/config/initializers/devise.rb`.

 ### 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.

@@ -284,7 +202,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
@@ -298,21 +216,7 @@ class ApplicationController < ActionController::Base
 end
 ```

-The above works for any additional fields where the parameters are simple scalar types. If you have nested attributes (say you're using `accepts_nested_attributes_for`), then you will need to tell devise about those nestings and types:
-
-```ruby
-class ApplicationController < ActionController::Base
-  before_action :configure_permitted_parameters, if: :devise_controller?
-
-  protected
-
-  def configure_permitted_parameters
-    devise_parameter_sanitizer.permit(:sign_up, keys: [:first_name, :last_name, address_attributes: [:country, :state, :city, :area, :postal_code]])
-  end
-end
-```
-
-Devise allows you to completely change Devise defaults or invoke custom behavior by passing a block:
+The above works for any additional fields where the parameters are simple scalar types. If you have nested attributes (say you're using `accepts_nested_attributes_for`), then you will need to tell devise about those nestings and types. 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

@@ -413,7 +317,6 @@ If the customization at the views level is not enough, you can customize each co
      ...
    end
    ```
-    (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:

@@ -435,7 +338,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
@@ -459,7 +362,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/master/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:

@@ -471,12 +374,6 @@ end

 This way, you tell Devise to use the scope `:user` when "/sign_in" is accessed. Notice `devise_scope` is also aliased as `as` in your router.

-Please note: You will still need to add `devise_for` in your routes in order to use helper methods such as `current_user`.
-
-```ruby
-devise_for :users, skip: :all
-```
-
 ### 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:
@@ -515,7 +412,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.

@@ -527,21 +424,12 @@ 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 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
 ```

@@ -621,7 +509,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-3-and-4-%28and-RSpec%29

 ### OmniAuth

@@ -633,7 +521,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

@@ -680,7 +568,7 @@ end

 ### Password reset tokens and Rails logs

-If you enable the [Recoverable](http://rubydoc.info/github/heartcombo/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:
+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.
@@ -696,50 +584,32 @@ config.log_level = :warn

 Devise supports ActiveRecord (default) and Mongoid. To select another ORM, simply require it in the initializer file.

-### 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:
-
-```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.
-
 ## 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 Rafael França, Leonardo Tegon, Carlos Antônio da Silva. Copyright 2009-2019 Plataformatec.
+MIT License. Copyright 2009-2017 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/1
+++ b/1
@@ -1,5 +1,4 @@
 # encoding: UTF-8
-# frozen_string_literal: true

 require 'bundler/gem_tasks'
 require 'rake/testtask'
--- a/app/controllers/devise/confirmations_controller.rb
+++ b/app/controllers/devise/confirmations_controller.rb
@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 class Devise::ConfirmationsController < DeviseController
  # GET /resource/confirmation/new
  def new
--- a/app/controllers/devise/omniauth_callbacks_controller.rb
+++ b/app/controllers/devise/omniauth_callbacks_controller.rb
@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 class Devise::OmniauthCallbacksController < DeviseController
  prepend_before_action { request.env["devise.skip_timeout"] = true }

@@ -8,7 +6,7 @@ class Devise::OmniauthCallbacksController < DeviseController
  end

  def failure
-    set_flash_message! :alert, :failure, kind: OmniAuth::Utils.camelize(failed_strategy.name), reason: failure_message
+    set_flash_message :alert, :failure, kind: OmniAuth::Utils.camelize(failed_strategy.name), reason: failure_message
    redirect_to after_omniauth_failure_path_for(resource_name)
  end

--- a/app/controllers/devise/passwords_controller.rb
+++ b/app/controllers/devise/passwords_controller.rb
@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 class Devise::PasswordsController < DeviseController
  prepend_before_action :require_no_authentication
  # Render the #edit only if coming from a reset password email link
@@ -39,7 +37,6 @@ class Devise::PasswordsController < DeviseController
      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
        sign_in(resource_name, resource)
      else
        set_flash_message!(:notice, :updated_not_active)
--- a/app/controllers/devise/registrations_controller.rb
+++ b/app/controllers/devise/registrations_controller.rb
@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 class Devise::RegistrationsController < DeviseController
  prepend_before_action :require_no_authentication, only: [:new, :create, :cancel]
  prepend_before_action :authenticate_scope!, only: [:edit, :update, :destroy]
@@ -7,7 +5,7 @@ class Devise::RegistrationsController < DeviseController

  # GET /resource/sign_up
  def new
-    build_resource
+    build_resource({})
    yield resource if block_given?
    respond_with resource
  end
@@ -50,9 +48,12 @@ class Devise::RegistrationsController < DeviseController
    resource_updated = update_resource(resource, account_update_params)
    yield resource if block_given?
    if resource_updated
-      set_flash_message_for_update(resource, prev_unconfirmed_email)
-      bypass_sign_in resource, scope: resource_name if sign_in_after_change_password?
-
+      if is_flashing_format?
+        flash_key = update_needs_confirmation?(resource, prev_unconfirmed_email) ?
+          :update_needs_confirmation : :updated
+        set_flash_message :notice, flash_key
+      end
+      bypass_sign_in resource, scope: resource_name
      respond_with resource, location: after_update_path_for(resource)
    else
      clean_up_passwords resource
@@ -96,8 +97,8 @@ class Devise::RegistrationsController < DeviseController

  # Build a devise resource passing in the session. Useful to move
  # temporary session data to the newly created user.
-  def build_resource(hash = {})
-    self.resource = resource_class.new_with_session(hash, session)
+  def build_resource(hash=nil)
+    self.resource = resource_class.new_with_session(hash || {}, session)
  end

  # Signs in a user on sign up. You can overwrite this method in your own
@@ -109,7 +110,7 @@ class Devise::RegistrationsController < DeviseController
  # The path used after sign up. You need to overwrite this method
  # in your own RegistrationsController.
  def after_sign_up_path_for(resource)
-    after_sign_in_path_for(resource) if is_navigational_format?
+    after_sign_in_path_for(resource)
  end

  # The path used after sign up for inactive accounts. You need to overwrite
@@ -124,7 +125,7 @@ class Devise::RegistrationsController < DeviseController
  # The default url to be used after updating a resource. You need to overwrite
  # this method in your own RegistrationsController.
  def after_update_path_for(resource)
-    sign_in_after_change_password? ? signed_in_root_path(resource) : new_session_path(resource_name)
+    signed_in_root_path(resource)
  end

  # Authenticates the current scope and gets the current resource from the session.
@@ -144,25 +145,4 @@ class Devise::RegistrationsController < DeviseController
  def translation_scope
    'devise.registrations'
  end
-
-  private
-
-  def set_flash_message_for_update(resource, prev_unconfirmed_email)
-    return unless is_flashing_format?
-
-    flash_key = if update_needs_confirmation?(resource, prev_unconfirmed_email)
-                  :update_needs_confirmation
-                elsif sign_in_after_change_password?
-                  :updated
-                else
-                  :updated_but_not_signed_in
-                end
-    set_flash_message :notice, flash_key
-  end
-
-  def sign_in_after_change_password?
-    return true if account_update_params[:password].blank?
-
-    Devise.sign_in_after_change_password
-  end
 end
--- a/app/controllers/devise/sessions_controller.rb
+++ b/app/controllers/devise/sessions_controller.rb
@@ -1,10 +1,8 @@
-# frozen_string_literal: true
-
 class Devise::SessionsController < DeviseController
  prepend_before_action :require_no_authentication, only: [:new, :create]
  prepend_before_action :allow_params_authentication!, only: :create
  prepend_before_action :verify_signed_out_user, only: :destroy
-  prepend_before_action(only: [:create, :destroy]) { request.env["devise.skip_timeout"] = true }
+  prepend_before_action only: [:create, :destroy] { request.env["devise.skip_timeout"] = true }

  # GET /resource/sign_in
  def new
--- a/app/controllers/devise/unlocks_controller.rb
+++ b/app/controllers/devise/unlocks_controller.rb
@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 class Devise::UnlocksController < DeviseController
  prepend_before_action :require_no_authentication

--- a/app/controllers/devise_controller.rb
+++ b/app/controllers/devise_controller.rb
@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 # All Devise controllers are inherited from here.
 class DeviseController < Devise.parent_controller.constantize
  include Devise::Controllers::ScopedViews
@@ -22,7 +20,7 @@ class DeviseController < Devise.parent_controller.constantize
  # Action Controller tests that forces _prefixes to be
  # loaded before even having a request object.
  #
-  # This method should be public as it is in ActionPack
+  # This method should be public as it is is in ActionPack
  # itself. Changing its visibility may break other gems.
  def _prefixes #:nodoc:
    @_prefixes ||= if self.class.scoped_views? && request && devise_mapping
@@ -112,7 +110,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
@@ -184,7 +182,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,30 +1,25 @@
-# frozen_string_literal: true
-
 module DeviseHelper
-  # Retain this method for backwards compatibility, deprecated in favor of modifying the
-  # devise/shared/error_messages partial.
+  # A simple way to show error messages for the current devise resource. If you need
+  # to customize this method, you can either overwrite it in your application helpers or
+  # copy the views to your application.
+  #
+  # This method is intended to stay simple and it is unlikely that we are going to change
+  # it to add more behavior or options.
  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.
-    DEPRECATION
-
    return "" if resource.errors.empty?

-    render "devise/shared/error_messages", resource: resource
+    messages = resource.errors.full_messages.map { |msg| content_tag(:li, msg) }.join
+    sentence = I18n.t("errors.messages.not_saved",
+                      count: resource.errors.count,
+                      resource: resource.class.model_name.human.downcase)
+
+    html = <<-HTML
+    <div id="error_explanation">
+      <h2>#{sentence}</h2>
+      <ul>#{messages}</ul>
+    </div>
+    HTML
+
+    html.html_safe
  end
 end
--- a/app/mailers/devise/mailer.rb
+++ b/app/mailers/devise/mailer.rb
@@ -1,29 +1,27 @@
-# frozen_string_literal: true
-
 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/confirmations/new.html.erb
+++ b/app/views/devise/confirmations/new.html.erb
@@ -1,11 +1,11 @@
 <h2>Resend confirmation instructions</h2>

 <%= form_for(resource, as: resource_name, url: confirmation_path(resource_name), html: { method: :post }) do |f| %>
-  <%= render "devise/shared/error_messages", resource: resource %>
+  <%= devise_error_messages! %>

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

  <div class="actions">
--- a/app/views/devise/passwords/edit.html.erb
+++ b/app/views/devise/passwords/edit.html.erb
@@ -1,7 +1,7 @@
 <h2>Change your password</h2>

 <%= form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :put }) do |f| %>
-  <%= render "devise/shared/error_messages", resource: resource %>
+  <%= devise_error_messages! %>
  <%= f.hidden_field :reset_password_token %>

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

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

  <div class="actions">
--- a/app/views/devise/passwords/new.html.erb
+++ b/app/views/devise/passwords/new.html.erb
@@ -1,11 +1,11 @@
 <h2>Forgot your password?</h2>

 <%= form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :post }) do |f| %>
-  <%= render "devise/shared/error_messages", resource: resource %>
+  <%= devise_error_messages! %>

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

  <div class="actions">
--- a/app/views/devise/registrations/edit.html.erb
+++ b/app/views/devise/registrations/edit.html.erb
@@ -1,11 +1,11 @@
 <h2>Edit <%= resource_name.to_s.humanize %></h2>

 <%= form_for(resource, as: resource_name, url: registration_path(resource_name), html: { method: :put }) do |f| %>
-  <%= render "devise/shared/error_messages", resource: resource %>
+  <%= devise_error_messages! %>

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

  <% if devise_mapping.confirmable? && resource.pending_reconfirmation? %>
@@ -14,7 +14,7 @@

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

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

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

  <div class="actions">
--- a/app/views/devise/registrations/new.html.erb
+++ b/app/views/devise/registrations/new.html.erb
@@ -1,11 +1,11 @@
 <h2>Sign up</h2>

 <%= form_for(resource, as: resource_name, url: registration_path(resource_name)) do |f| %>
-  <%= render "devise/shared/error_messages", resource: resource %>
+  <%= devise_error_messages! %>

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

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

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

  <div class="actions">
--- a/app/views/devise/sessions/new.html.erb
+++ b/app/views/devise/sessions/new.html.erb
@@ -3,20 +3,20 @@
 <%= form_for(resource, as: resource_name, url: session_path(resource_name)) do |f| %>
  <div class="field">
    <%= f.label :email %><br />
-    <%= f.email_field :email, autofocus: true, autocomplete: "email" %>
+    <%= f.email_field :email, autofocus: true %>
  </div>

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

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

  <div class="actions">
    <%= f.submit "Log in" %>
--- a/app/views/devise/shared/_error_messages.html.erb
+++ b/app/views/devise/shared/_error_messages.html.erb
@@ -1,15 +0,0 @@
-<% if resource.errors.any? %>
-  <div id="error_explanation">
-    <h2>
-      <%= I18n.t("errors.messages.not_saved",
-                 count: resource.errors.count,
-                 resource: resource.class.model_name.human.downcase)
-       %>
-    </h2>
-    <ul>
-      <% resource.errors.full_messages.each do |message| %>
-        <li><%= message %></li>
-      <% end %>
-    </ul>
-  </div>
-<% end %>
--- a/app/views/devise/shared/_links.html.erb
+++ b/app/views/devise/shared/_links.html.erb
@@ -1,25 +1,25 @@
 <%- if controller_name != 'sessions' %>
  <%= link_to "Log in", new_session_path(resource_name) %><br />
-<% end %>
+<% end -%>

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

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

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

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

 <%- if devise_mapping.omniauthable? %>
  <%- resource_class.omniauth_providers.each do |provider| %>
    <%= link_to "Sign in with #{OmniAuth::Utils.camelize(provider)}", omniauth_authorize_path(resource_name, provider) %><br />
-  <% end %>
-<% end %>
+  <% end -%>
+<% end -%>
--- a/app/views/devise/unlocks/new.html.erb
+++ b/app/views/devise/unlocks/new.html.erb
@@ -1,11 +1,11 @@
 <h2>Resend unlock instructions</h2>

 <%= form_for(resource, as: resource_name, url: unlock_path(resource_name), html: { method: :post }) do |f| %>
-  <%= render "devise/shared/error_messages", resource: resource %>
+  <%= devise_error_messages! %>

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

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

-# Remove this begin/rescue once Rails 4 support is removed.
+require 'bundler/setup'
 begin
-  require 'bundler/setup'
-  require 'rails/test_unit/runner'
-  require 'rails/test_unit/reporter'
-  require 'rails/test_unit/line_filtering'
-
-  Rails::TestUnitReporter.executable = 'bin/test'
-
-  Rails::TestUnit::Runner.parse_options(ARGV)
-  Rails::TestUnit::Runner.run(ARGV)
+  require 'rails/test_unit/minitest_plugin'
 rescue LoadError
  exec 'rake'
 end
+
+Rails::TestUnitReporter.executable = 'bin/test'
+
+exit Minitest.run(ARGV)
--- 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:
@@ -42,9 +42,8 @@ en:
      signed_up_but_inactive: "You have signed up successfully. However, we could not sign you in because your account is not yet activated."
      signed_up_but_locked: "You have signed up successfully. However, we could not sign you in because your account is locked."
      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."
+      update_needs_confirmation: "You updated your account successfully, but we need to verify your new email address. Please check your email and follow the confirm 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"
    sessions:
      signed_in: "Signed in successfully."
      signed_out: "Signed out successfully."
--- a/devise.gemspec
+++ b/devise.gemspec
@@ -1,6 +1,4 @@
 # -*- encoding: utf-8 -*-
-# frozen_string_literal: true
-
 $:.push File.expand_path("../lib", __FILE__)
 require "devise/version"

@@ -10,18 +8,19 @@ 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.files         = Dir["{app,config,lib}/**/*", "CHANGELOG.md", "MIT-LICENSE", "README.md"]
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- test/*`.split("\n")
  s.require_paths = ["lib"]
  s.required_ruby_version = '>= 2.1.0'

  s.add_dependency("warden", "~> 1.2.3")
  s.add_dependency("orm_adapter", "~> 0.1")
  s.add_dependency("bcrypt", "~> 3.0")
-  s.add_dependency("railties", ">= 4.1.0")
+  s.add_dependency("railties", ">= 4.1.0", "< 5.2")
  s.add_dependency("responders")
 end
--- a/gemfiles/Gemfile.rails-4.1-stable
+++ b/gemfiles/Gemfile.rails-4.1-stable
@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 source "https://rubygems.org"

 gemspec path: ".."
@@ -7,14 +5,11 @@ gemspec path: ".."
 gem "rails", github: "rails/rails", branch: "4-1-stable"
 gem "omniauth"
 gem "omniauth-oauth2"
-gem "rdoc", "~> 5.1"
-# Force this version because it's breaking on CI since a higher nokogiri version requires Ruby 2.3+.
-gem "nokogiri", "1.9.1"
+gem "rdoc"

 group :test do
  gem "omniauth-facebook"
  gem "omniauth-openid"
-  gem "timecop"
  gem "webrat", "0.7.3", require: false
  gem "mocha", "~> 1.1", require: false
  gem 'test_after_commit', require: false
@@ -27,7 +22,7 @@ platforms :jruby do
 end

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

 group :mongoid do
--- a/gemfiles/Gemfile.rails-4.1-stable.lock
+++ b/gemfiles/Gemfile.rails-4.1-stable.lock
@@ -1,5 +1,5 @@
 GIT
-  remote: https://github.com/rails/rails.git
+  remote: git://github.com/rails/rails.git
  revision: 0cad778c2605a5204a05a9f1dbd3344e39f248d8
  branch: 4-1-stable
  specs:
@@ -7,6 +7,30 @@ GIT
      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.3.0)
+      bcrypt (~> 3.0)
+      orm_adapter (~> 0.1)
+      railties (>= 4.1.0, < 5.2)
+      responders
+      warden (~> 1.2.3)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
    actionpack (4.1.16)
      actionview (= 4.1.16)
      activesupport (= 4.1.16)
@@ -29,55 +53,29 @@ GIT
      minitest (~> 5.1)
      thread_safe (~> 0.1)
      tzinfo (~> 1.1)
-    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)
-    railties (4.1.16)
-      actionpack (= 4.1.16)
-      activesupport (= 4.1.16)
-      rake (>= 0.8.7)
-      thor (>= 0.18.1, < 2.0)
-
-PATH
-  remote: ..
-  specs:
-    devise (4.7.3)
-      bcrypt (~> 3.0)
-      orm_adapter (~> 0.1)
-      railties (>= 4.1.0)
-      responders
-      warden (~> 1.2.3)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
    arel (5.0.1.20140414130214)
-    bcrypt (3.1.13)
-    bson (3.2.7)
-    builder (3.2.4)
-    concurrent-ruby (1.1.6)
-    connection_pool (2.2.3)
+    bcrypt (3.1.11)
+    bson (3.2.6)
+    builder (3.2.3)
+    concurrent-ruby (1.0.5)
+    connection_pool (2.2.1)
    erubis (2.7.0)
-    faraday (1.0.1)
+    faraday (0.11.0)
      multipart-post (>= 1.2, < 3)
-    hashie (3.6.0)
-    i18n (0.9.5)
-      concurrent-ruby (~> 1.0)
+    hashie (3.5.5)
+    i18n (0.8.1)
    json (1.8.6)
-    jwt (2.2.1)
-    mail (2.7.1)
-      mini_mime (>= 0.1.1)
-    mini_mime (1.0.2)
-    mini_portile2 (2.4.0)
-    minitest (5.14.1)
-    mocha (1.11.2)
+    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.1.0)
+    minitest (5.10.1)
+    mocha (1.2.1)
+      metaclass (~> 0.0.1)
    mongoid (4.0.2)
      activemodel (~> 4.0)
      moped (~> 2.0.0)
@@ -87,30 +85,30 @@ GEM
      bson (~> 3.0)
      connection_pool (~> 2.0)
      optionable (~> 0.2.0)
-    multi_json (1.14.1)
+    multi_json (1.12.1)
    multi_xml (0.6.0)
-    multipart-post (2.1.1)
-    nokogiri (1.9.1)
-      mini_portile2 (~> 2.4.0)
-    oauth2 (1.4.4)
-      faraday (>= 0.8, < 2.0)
-      jwt (>= 1.0, < 3.0)
+    multipart-post (2.0.0)
+    nokogiri (1.7.0.1)
+      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.4.2)
      hashie (>= 1.2, < 4)
      rack (>= 1.0, < 3)
-    omniauth-facebook (6.0.0)
+    omniauth-facebook (4.0.0)
      omniauth-oauth2 (~> 1.2)
-    omniauth-oauth2 (1.5.0)
-      oauth2 (~> 1.1)
+    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.1)
+    origin (2.3.0)
    orm_adapter (0.5.0)
    rack (1.5.5)
    rack-openid (1.3.1)
@@ -118,12 +116,17 @@ GEM
      ruby-openid (>= 2.1.8)
    rack-test (0.6.3)
      rack (>= 1.0)
-    rake (13.0.1)
+    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.9.2)
-    sprockets (3.7.2)
+    ruby-openid (2.7.0)
+    sprockets (3.7.1)
      concurrent-ruby (~> 1.0)
      rack (> 1, < 3)
    sprockets-rails (2.3.3)
@@ -131,12 +134,11 @@ GEM
      activesupport (>= 3.0)
      sprockets (>= 2.8, < 4.0)
    sqlite3 (1.3.13)
-    test_after_commit (1.2.2)
-      activerecord (>= 3.2, < 5.0)
-    thor (1.0.1)
+    test_after_commit (1.1.0)
+      activerecord (>= 3.2)
+    thor (0.19.4)
    thread_safe (0.3.6)
-    timecop (0.9.1)
-    tzinfo (1.2.7)
+    tzinfo (1.2.2)
      thread_safe (~> 0.1)
    warden (1.2.7)
      rack (>= 1.0)
@@ -155,17 +157,15 @@ DEPENDENCIES
  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)
+  rdoc
+  sqlite3
  test_after_commit
-  timecop
  webrat (= 0.7.3)

 BUNDLED WITH
-   1.17.3
+   1.14.6
--- a/gemfiles/Gemfile.rails-4.2-stable
+++ b/gemfiles/Gemfile.rails-4.2-stable
@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 source "https://rubygems.org"

 gemspec path: ".."
@@ -7,13 +5,11 @@ gemspec path: ".."
 gem "rails", github: "rails/rails", branch: "4-2-stable"
 gem "omniauth"
 gem "omniauth-oauth2"
-gem "rdoc", "~> 5.1"
-gem "nokogiri", "1.9.1"
+gem "rdoc"

 group :test do
  gem "omniauth-facebook"
  gem "omniauth-openid"
-  gem "timecop"
  gem "webrat", "0.7.3", require: false
  gem "mocha", "~> 1.1", require: false
  gem 'test_after_commit', require: false
@@ -26,7 +22,7 @@ platforms :jruby do
 end

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

 group :mongoid do
--- a/gemfiles/Gemfile.rails-4.2-stable.lock
+++ b/gemfiles/Gemfile.rails-4.2-stable.lock
@@ -1,66 +1,66 @@
 GIT
-  remote: https://github.com/rails/rails.git
-  revision: c0cb0cbf976a3cf8ad1b0e2d0f813602a712e997
+  remote: git://github.com/rails/rails.git
+  revision: dc3ae21802c316e1639239d28202db7aa7fb7cac
  branch: 4-2-stable
  specs:
-    actionmailer (4.2.11.3)
-      actionpack (= 4.2.11.3)
-      actionview (= 4.2.11.3)
-      activejob (= 4.2.11.3)
+    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.11.3)
-      actionview (= 4.2.11.3)
-      activesupport (= 4.2.11.3)
+    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.11.3)
-      activesupport (= 4.2.11.3)
+    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.11.3)
-      activesupport (= 4.2.11.3)
+    activejob (4.2.8)
+      activesupport (= 4.2.8)
      globalid (>= 0.3.0)
-    activemodel (4.2.11.3)
-      activesupport (= 4.2.11.3)
+    activemodel (4.2.8)
+      activesupport (= 4.2.8)
      builder (~> 3.1)
-    activerecord (4.2.11.3)
-      activemodel (= 4.2.11.3)
-      activesupport (= 4.2.11.3)
+    activerecord (4.2.8)
+      activemodel (= 4.2.8)
+      activesupport (= 4.2.8)
      arel (~> 6.0)
-    activesupport (4.2.11.3)
+    activesupport (4.2.8)
      i18n (~> 0.7)
      minitest (~> 5.1)
      thread_safe (~> 0.3, >= 0.3.4)
      tzinfo (~> 1.1)
-    rails (4.2.11.3)
-      actionmailer (= 4.2.11.3)
-      actionpack (= 4.2.11.3)
-      actionview (= 4.2.11.3)
-      activejob (= 4.2.11.3)
-      activemodel (= 4.2.11.3)
-      activerecord (= 4.2.11.3)
-      activesupport (= 4.2.11.3)
+    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.11.3)
+      railties (= 4.2.8)
      sprockets-rails
-    railties (4.2.11.3)
-      actionpack (= 4.2.11.3)
-      activesupport (= 4.2.11.3)
+    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.3)
+    devise (4.3.0)
      bcrypt (~> 3.0)
      orm_adapter (~> 0.1)
-      railties (>= 4.1.0)
+      railties (>= 4.1.0, < 5.2)
      responders
      warden (~> 1.2.3)

@@ -68,30 +68,31 @@ GEM
  remote: https://rubygems.org/
  specs:
    arel (6.0.4)
-    bcrypt (3.1.13)
-    bson (3.2.7)
-    builder (3.2.4)
-    concurrent-ruby (1.1.6)
-    connection_pool (2.2.3)
-    crass (1.0.6)
+    bcrypt (3.1.11)
+    bson (3.2.6)
+    builder (3.2.3)
+    concurrent-ruby (1.0.5)
+    connection_pool (2.2.1)
    erubis (2.7.0)
-    faraday (1.0.1)
+    faraday (0.11.0)
      multipart-post (>= 1.2, < 3)
-    globalid (0.4.2)
-      activesupport (>= 4.2.0)
-    hashie (4.1.0)
-    i18n (0.9.5)
-      concurrent-ruby (~> 1.0)
-    jwt (2.2.1)
-    loofah (2.5.0)
-      crass (~> 1.0.2)
+    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.7.1)
-      mini_mime (>= 0.1.1)
-    mini_mime (1.0.2)
-    mini_portile2 (2.4.0)
-    minitest (5.14.1)
-    mocha (1.11.2)
+    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.1.0)
+    minitest (5.10.1)
+    mocha (1.2.1)
+      metaclass (~> 0.0.1)
    mongoid (4.0.2)
      activemodel (~> 4.0)
      moped (~> 2.0.0)
@@ -101,32 +102,32 @@ GEM
      bson (~> 3.0)
      connection_pool (~> 2.0)
      optionable (~> 0.2.0)
-    multi_json (1.14.1)
+    multi_json (1.12.1)
    multi_xml (0.6.0)
-    multipart-post (2.1.1)
-    nokogiri (1.9.1)
-      mini_portile2 (~> 2.4.0)
-    oauth2 (1.4.4)
-      faraday (>= 0.8, < 2.0)
-      jwt (>= 1.0, < 3.0)
+    multipart-post (2.0.0)
+    nokogiri (1.7.0.1)
+      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.9.1)
-      hashie (>= 3.4.6)
+    omniauth (1.6.1)
+      hashie (>= 3.4.6, < 3.6.0)
      rack (>= 1.6.2, < 3)
-    omniauth-facebook (6.0.0)
+    omniauth-facebook (4.0.0)
      omniauth-oauth2 (~> 1.2)
-    omniauth-oauth2 (1.6.0)
-      oauth2 (~> 1.1)
-      omniauth (~> 1.9)
+    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.1)
+    origin (2.3.0)
    orm_adapter (0.5.0)
-    rack (1.6.13)
+    rack (1.6.5)
    rack-openid (1.3.1)
      rack (>= 1.1.0)
      ruby-openid (>= 2.1.8)
@@ -134,32 +135,31 @@ GEM
      rack (>= 1.0)
    rails-deprecated_sanitizer (1.0.3)
      activesupport (>= 4.2.0.alpha)
-    rails-dom-testing (1.0.9)
-      activesupport (>= 4.2.0, < 5.0)
+    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.3.0)
-      loofah (~> 2.3)
-    rake (13.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.9.2)
-    sprockets (4.0.1)
+    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.1)
+    sprockets-rails (3.2.0)
      actionpack (>= 4.0)
      activesupport (>= 4.0)
      sprockets (>= 3.0.0)
    sqlite3 (1.3.13)
-    test_after_commit (1.2.2)
-      activerecord (>= 3.2, < 5.0)
-    thor (1.0.1)
+    test_after_commit (1.1.0)
+      activerecord (>= 3.2)
+    thor (0.19.4)
    thread_safe (0.3.6)
-    timecop (0.9.1)
-    tzinfo (1.2.7)
+    tzinfo (1.2.2)
      thread_safe (~> 0.1)
    warden (1.2.7)
      rack (>= 1.0)
@@ -178,17 +178,15 @@ DEPENDENCIES
  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)
+  rdoc
+  sqlite3
  test_after_commit
-  timecop
  webrat (= 0.7.3)

 BUNDLED WITH
-   1.17.3
+   1.14.6
--- a/gemfiles/Gemfile.rails-5.0-stable
+++ b/gemfiles/Gemfile.rails-5.0-stable
@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 source "https://rubygems.org"

 gemspec path: ".."
@@ -15,19 +13,21 @@ gem "rails-controller-testing"

 gem "responders", "~> 2.1"

+# TODO: Remove this line when Rails 5.0.3 is released
+gem "minitest", "< 5.10.2"
+
 group :test do
  gem "omniauth-facebook"
  gem "omniauth-openid"
-  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
-  gem "sqlite3", "~> 1.3.6"
+  gem "sqlite3"
 end

-# TODO:
-# group :mongoid do
-#   gem "mongoid", "~> 4.0.0"
-# end
+group :mongoid do
+  gem "mongoid"
+end
--- a/gemfiles/Gemfile.rails-5.0-stable.lock
+++ b/gemfiles/Gemfile.rails-5.0-stable.lock
@@ -1,171 +1,179 @@
 GIT
-  remote: https://github.com/rails/activemodel-serializers-xml.git
-  revision: 93689638c28525acc65afb638fce866826532641
+  remote: git://github.com/rails/activemodel-serializers-xml.git
+  revision: dd9c0acf26aab111ebc647cd8deb99ebc6946531
  specs:
-    activemodel-serializers-xml (1.0.2)
-      activemodel (>= 5.0.0.a)
-      activesupport (>= 5.0.0.a)
+    activemodel-serializers-xml (1.0.1)
+      activemodel (> 5.x)
+      activesupport (> 5.x)
      builder (~> 3.1)

 PATH
  remote: ..
  specs:
-    devise (4.7.3)
+    devise (4.3.0)
      bcrypt (~> 3.0)
      orm_adapter (~> 0.1)
-      railties (>= 4.1.0)
+      railties (>= 4.1.0, < 5.2)
      responders
      warden (~> 1.2.3)

 GEM
  remote: https://rubygems.org/
  specs:
-    actioncable (5.0.7.2)
-      actionpack (= 5.0.7.2)
+    actioncable (5.0.2)
+      actionpack (= 5.0.2)
      nio4r (>= 1.2, < 3.0)
      websocket-driver (~> 0.6.1)
-    actionmailer (5.0.7.2)
-      actionpack (= 5.0.7.2)
-      actionview (= 5.0.7.2)
-      activejob (= 5.0.7.2)
+    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.7.2)
-      actionview (= 5.0.7.2)
-      activesupport (= 5.0.7.2)
+    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.7.2)
-      activesupport (= 5.0.7.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.7.2)
-      activesupport (= 5.0.7.2)
+    activejob (5.0.2)
+      activesupport (= 5.0.2)
      globalid (>= 0.3.6)
-    activemodel (5.0.7.2)
-      activesupport (= 5.0.7.2)
-    activerecord (5.0.7.2)
-      activemodel (= 5.0.7.2)
-      activesupport (= 5.0.7.2)
+    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.7.2)
+    activesupport (5.0.2)
      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
+      i18n (~> 0.7)
      minitest (~> 5.1)
      tzinfo (~> 1.1)
    arel (7.1.4)
-    bcrypt (3.1.13)
-    builder (3.2.4)
-    concurrent-ruby (1.1.6)
-    crass (1.0.6)
+    bcrypt (3.1.11)
+    bson (4.2.1)
+    builder (3.2.3)
+    concurrent-ruby (1.0.5)
    erubis (2.7.0)
-    faraday (1.0.1)
+    faraday (0.11.0)
      multipart-post (>= 1.2, < 3)
-    globalid (0.4.2)
+    globalid (0.4.0)
      activesupport (>= 4.2.0)
-    hashie (4.1.0)
-    i18n (1.8.3)
-      concurrent-ruby (~> 1.0)
-    jwt (2.2.1)
-    loofah (2.5.0)
-      crass (~> 1.0.2)
+    hashie (3.5.5)
+    i18n (0.8.1)
+    jwt (1.5.6)
+    loofah (2.0.3)
      nokogiri (>= 1.5.9)
-    mail (2.7.1)
-      mini_mime (>= 0.1.1)
-    method_source (1.0.0)
-    mini_mime (1.0.2)
-    mini_portile2 (2.4.0)
-    minitest (5.14.1)
-    mocha (1.11.2)
-    multi_json (1.14.1)
+    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)
+    mongo (2.4.1)
+      bson (>= 4.2.1, < 5.0.0)
+    mongoid (6.1.0)
+      activemodel (~> 5.0)
+      mongo (>= 2.4.1, < 3.0.0)
+    multi_json (1.12.1)
    multi_xml (0.6.0)
-    multipart-post (2.1.1)
-    nio4r (2.5.2)
-    nokogiri (1.10.9)
-      mini_portile2 (~> 2.4.0)
-    oauth2 (1.4.4)
-      faraday (>= 0.8, < 2.0)
-      jwt (>= 1.0, < 3.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.9.1)
-      hashie (>= 3.4.6)
+    omniauth (1.6.1)
+      hashie (>= 3.4.6, < 3.6.0)
      rack (>= 1.6.2, < 3)
-    omniauth-facebook (6.0.0)
+    omniauth-facebook (4.0.0)
      omniauth-oauth2 (~> 1.2)
-    omniauth-oauth2 (1.6.0)
-      oauth2 (~> 1.1)
-      omniauth (~> 1.9)
+    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.2.2)
+    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.7.2)
-      actioncable (= 5.0.7.2)
-      actionmailer (= 5.0.7.2)
-      actionpack (= 5.0.7.2)
-      actionview (= 5.0.7.2)
-      activejob (= 5.0.7.2)
-      activemodel (= 5.0.7.2)
-      activerecord (= 5.0.7.2)
-      activesupport (= 5.0.7.2)
-      bundler (>= 1.3.0)
-      railties (= 5.0.7.2)
+    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.4)
-      actionpack (>= 5.0.1.x)
-      actionview (>= 5.0.1.x)
-      activesupport (>= 5.0.1.x)
+    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.3.0)
-      loofah (~> 2.3)
-    railties (5.0.7.2)
-      actionpack (= 5.0.7.2)
-      activesupport (= 5.0.7.2)
+    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 (13.0.1)
-    rdoc (6.2.1)
-    responders (2.4.1)
-      actionpack (>= 4.2.0, < 6.0)
-      railties (>= 4.2.0, < 6.0)
-    ruby-openid (2.9.2)
-    sprockets (4.0.1)
+    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.1)
+    sprockets-rails (3.2.0)
      actionpack (>= 4.0)
      activesupport (>= 4.0)
      sprockets (>= 3.0.0)
    sqlite3 (1.3.13)
-    thor (1.0.1)
+    test_after_commit (1.1.0)
+      activerecord (>= 3.2)
+    thor (0.19.4)
    thread_safe (0.3.6)
-    timecop (0.9.1)
-    tzinfo (1.2.7)
+    tzinfo (1.2.3)
      thread_safe (~> 0.1)
-    warden (1.2.8)
-      rack (>= 2.0.6)
+    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.5)
+    websocket-extensions (0.1.2)

 PLATFORMS
  ruby
@@ -173,7 +181,9 @@ PLATFORMS
 DEPENDENCIES
  activemodel-serializers-xml!
  devise!
+  minitest (< 5.10.2)
  mocha (~> 1.1)
+  mongoid
  omniauth
  omniauth-facebook
  omniauth-oauth2
@@ -182,9 +192,9 @@ DEPENDENCIES
  rails-controller-testing
  rdoc
  responders (~> 2.1)
-  sqlite3 (~> 1.3.6)
-  timecop
+  sqlite3
+  test_after_commit
  webrat (= 0.7.3)

 BUNDLED WITH
-   1.17.3
+   1.14.6
--- a/gemfiles/Gemfile.rails-5.1-stable
+++ b/gemfiles/Gemfile.rails-5.1-stable
@@ -1,26 +0,0 @@
-source "https://rubygems.org"
-
-gemspec path: ".."
-
-gem "rails", '~> 5.1.0'
-gem "omniauth"
-gem "omniauth-oauth2"
-gem "rdoc"
-
-gem "activemodel-serializers-xml", github: "rails/activemodel-serializers-xml"
-
-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
--- a/gemfiles/Gemfile.rails-5.1-stable.lock
+++ b/gemfiles/Gemfile.rails-5.1-stable.lock
@@ -1,190 +0,0 @@
-GIT
-  remote: https://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.3)
-      bcrypt (~> 3.0)
-      orm_adapter (~> 0.1)
-      railties (>= 4.1.0)
-      responders
-      warden (~> 1.2.3)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    actioncable (5.1.7)
-      actionpack (= 5.1.7)
-      nio4r (~> 2.0)
-      websocket-driver (~> 0.6.1)
-    actionmailer (5.1.7)
-      actionpack (= 5.1.7)
-      actionview (= 5.1.7)
-      activejob (= 5.1.7)
-      mail (~> 2.5, >= 2.5.4)
-      rails-dom-testing (~> 2.0)
-    actionpack (5.1.7)
-      actionview (= 5.1.7)
-      activesupport (= 5.1.7)
-      rack (~> 2.0)
-      rack-test (>= 0.6.3)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.1.7)
-      activesupport (= 5.1.7)
-      builder (~> 3.1)
-      erubi (~> 1.4)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activejob (5.1.7)
-      activesupport (= 5.1.7)
-      globalid (>= 0.3.6)
-    activemodel (5.1.7)
-      activesupport (= 5.1.7)
-    activerecord (5.1.7)
-      activemodel (= 5.1.7)
-      activesupport (= 5.1.7)
-      arel (~> 8.0)
-    activesupport (5.1.7)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-    arel (8.0.0)
-    bcrypt (3.1.13)
-    builder (3.2.4)
-    concurrent-ruby (1.1.6)
-    crass (1.0.6)
-    erubi (1.9.0)
-    faraday (1.0.1)
-      multipart-post (>= 1.2, < 3)
-    globalid (0.4.2)
-      activesupport (>= 4.2.0)
-    hashie (4.1.0)
-    i18n (1.8.3)
-      concurrent-ruby (~> 1.0)
-    jwt (2.2.1)
-    loofah (2.5.0)
-      crass (~> 1.0.2)
-      nokogiri (>= 1.5.9)
-    mail (2.7.1)
-      mini_mime (>= 0.1.1)
-    method_source (1.0.0)
-    mini_mime (1.0.2)
-    mini_portile2 (2.4.0)
-    minitest (5.14.1)
-    mocha (1.11.2)
-    multi_json (1.14.1)
-    multi_xml (0.6.0)
-    multipart-post (2.1.1)
-    nio4r (2.5.2)
-    nokogiri (1.10.9)
-      mini_portile2 (~> 2.4.0)
-    oauth2 (1.4.4)
-      faraday (>= 0.8, < 2.0)
-      jwt (>= 1.0, < 3.0)
-      multi_json (~> 1.3)
-      multi_xml (~> 0.5)
-      rack (>= 1.2, < 3)
-    omniauth (1.9.1)
-      hashie (>= 3.4.6)
-      rack (>= 1.6.2, < 3)
-    omniauth-facebook (6.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.2.2)
-    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.1.7)
-      actioncable (= 5.1.7)
-      actionmailer (= 5.1.7)
-      actionpack (= 5.1.7)
-      actionview (= 5.1.7)
-      activejob (= 5.1.7)
-      activemodel (= 5.1.7)
-      activerecord (= 5.1.7)
-      activesupport (= 5.1.7)
-      bundler (>= 1.3.0)
-      railties (= 5.1.7)
-      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.3.0)
-      loofah (~> 2.3)
-    railties (5.1.7)
-      actionpack (= 5.1.7)
-      activesupport (= 5.1.7)
-      method_source
-      rake (>= 0.8.7)
-      thor (>= 0.18.1, < 2.0)
-    rake (13.0.1)
-    rdoc (6.2.1)
-    responders (2.4.1)
-      actionpack (>= 4.2.0, < 6.0)
-      railties (>= 4.2.0, < 6.0)
-    ruby-openid (2.9.2)
-    sprockets (4.0.1)
-      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 (1.0.1)
-    thread_safe (0.3.6)
-    timecop (0.9.1)
-    tzinfo (1.2.7)
-      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.6.5)
-      websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.5)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  activemodel-serializers-xml!
-  devise!
-  mocha (~> 1.1)
-  omniauth
-  omniauth-facebook
-  omniauth-oauth2
-  omniauth-openid
-  rails (~> 5.1.0)
-  rails-controller-testing
-  rdoc
-  responders (~> 2.1)
-  sqlite3 (~> 1.3.6)
-  timecop
-  webrat (= 0.7.3)
-
-BUNDLED WITH
-   1.17.3
--- a/gemfiles/Gemfile.rails-5.2-stable
+++ b/gemfiles/Gemfile.rails-5.2-stable
@@ -1,26 +0,0 @@
-source "https://rubygems.org"
-
-gemspec path: ".."
-
-gem "rails", '~> 5.2.0'
-gem "omniauth"
-gem "omniauth-oauth2"
-gem "rdoc"
-
-gem "activemodel-serializers-xml", github: "rails/activemodel-serializers-xml"
-
-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
--- a/gemfiles/Gemfile.rails-5.2-stable.lock
+++ b/gemfiles/Gemfile.rails-5.2-stable.lock
@@ -1,198 +0,0 @@
-GIT
-  remote: https://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.3)
-      bcrypt (~> 3.0)
-      orm_adapter (~> 0.1)
-      railties (>= 4.1.0)
-      responders
-      warden (~> 1.2.3)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    actioncable (5.2.4.3)
-      actionpack (= 5.2.4.3)
-      nio4r (~> 2.0)
-      websocket-driver (>= 0.6.1)
-    actionmailer (5.2.4.3)
-      actionpack (= 5.2.4.3)
-      actionview (= 5.2.4.3)
-      activejob (= 5.2.4.3)
-      mail (~> 2.5, >= 2.5.4)
-      rails-dom-testing (~> 2.0)
-    actionpack (5.2.4.3)
-      actionview (= 5.2.4.3)
-      activesupport (= 5.2.4.3)
-      rack (~> 2.0, >= 2.0.8)
-      rack-test (>= 0.6.3)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.2.4.3)
-      activesupport (= 5.2.4.3)
-      builder (~> 3.1)
-      erubi (~> 1.4)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activejob (5.2.4.3)
-      activesupport (= 5.2.4.3)
-      globalid (>= 0.3.6)
-    activemodel (5.2.4.3)
-      activesupport (= 5.2.4.3)
-    activerecord (5.2.4.3)
-      activemodel (= 5.2.4.3)
-      activesupport (= 5.2.4.3)
-      arel (>= 9.0)
-    activestorage (5.2.4.3)
-      actionpack (= 5.2.4.3)
-      activerecord (= 5.2.4.3)
-      marcel (~> 0.3.1)
-    activesupport (5.2.4.3)
-      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.4)
-    concurrent-ruby (1.1.6)
-    crass (1.0.6)
-    erubi (1.9.0)
-    faraday (1.0.1)
-      multipart-post (>= 1.2, < 3)
-    globalid (0.4.2)
-      activesupport (>= 4.2.0)
-    hashie (4.1.0)
-    i18n (1.8.3)
-      concurrent-ruby (~> 1.0)
-    jwt (2.2.1)
-    loofah (2.5.0)
-      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)
-    method_source (1.0.0)
-    mimemagic (0.3.5)
-    mini_mime (1.0.2)
-    mini_portile2 (2.4.0)
-    minitest (5.14.1)
-    mocha (1.11.2)
-    multi_json (1.14.1)
-    multi_xml (0.6.0)
-    multipart-post (2.1.1)
-    nio4r (2.5.2)
-    nokogiri (1.10.9)
-      mini_portile2 (~> 2.4.0)
-    oauth2 (1.4.4)
-      faraday (>= 0.8, < 2.0)
-      jwt (>= 1.0, < 3.0)
-      multi_json (~> 1.3)
-      multi_xml (~> 0.5)
-      rack (>= 1.2, < 3)
-    omniauth (1.9.1)
-      hashie (>= 3.4.6)
-      rack (>= 1.6.2, < 3)
-    omniauth-facebook (6.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.2.2)
-    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.4.3)
-      actioncable (= 5.2.4.3)
-      actionmailer (= 5.2.4.3)
-      actionpack (= 5.2.4.3)
-      actionview (= 5.2.4.3)
-      activejob (= 5.2.4.3)
-      activemodel (= 5.2.4.3)
-      activerecord (= 5.2.4.3)
-      activestorage (= 5.2.4.3)
-      activesupport (= 5.2.4.3)
-      bundler (>= 1.3.0)
-      railties (= 5.2.4.3)
-      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.3.0)
-      loofah (~> 2.3)
-    railties (5.2.4.3)
-      actionpack (= 5.2.4.3)
-      activesupport (= 5.2.4.3)
-      method_source
-      rake (>= 0.8.7)
-      thor (>= 0.19.0, < 2.0)
-    rake (13.0.1)
-    rdoc (6.2.1)
-    responders (2.4.1)
-      actionpack (>= 4.2.0, < 6.0)
-      railties (>= 4.2.0, < 6.0)
-    ruby-openid (2.9.2)
-    sprockets (4.0.1)
-      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 (1.0.1)
-    thread_safe (0.3.6)
-    timecop (0.9.1)
-    tzinfo (1.2.7)
-      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.2)
-      websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.5)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  activemodel-serializers-xml!
-  devise!
-  mocha (~> 1.1)
-  omniauth
-  omniauth-facebook
-  omniauth-oauth2
-  omniauth-openid
-  rails (~> 5.2.0)
-  rails-controller-testing
-  rdoc
-  responders (~> 2.1)
-  sqlite3 (~> 1.3.6)
-  timecop
-  webrat (= 0.7.3)
-
-BUNDLED WITH
-   1.17.3
--- a/gemfiles/Gemfile.rails-6.0-stable
+++ b/gemfiles/Gemfile.rails-6.0-stable
@@ -1,26 +0,0 @@
-source "https://rubygems.org"
-
-gemspec path: ".."
-
-gem "rails", '~> 6.0.0'
-gem "omniauth"
-gem "omniauth-oauth2"
-gem "rdoc"
-
-gem "activemodel-serializers-xml", github: "rails/activemodel-serializers-xml"
-
-gem "rails-controller-testing", github: "rails/rails-controller-testing"
-
-gem "responders", "~> 3.0"
-
-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.4"
-end
--- a/gemfiles/Gemfile.rails-6.0-stable.lock
+++ b/gemfiles/Gemfile.rails-6.0-stable.lock
@@ -1,219 +0,0 @@
-GIT
-  remote: https://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)
-
-GIT
-  remote: https://github.com/rails/rails-controller-testing.git
-  revision: 4b15c86e82ee380f2a7cc009e470368f7520560a
-  specs:
-    rails-controller-testing (1.0.5)
-      actionpack (>= 5.0.1.rc1)
-      actionview (>= 5.0.1.rc1)
-      activesupport (>= 5.0.1.rc1)
-
-PATH
-  remote: ..
-  specs:
-    devise (4.7.3)
-      bcrypt (~> 3.0)
-      orm_adapter (~> 0.1)
-      railties (>= 4.1.0)
-      responders
-      warden (~> 1.2.3)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    actioncable (6.0.3.2)
-      actionpack (= 6.0.3.2)
-      nio4r (~> 2.0)
-      websocket-driver (>= 0.6.1)
-    actionmailbox (6.0.3.2)
-      actionpack (= 6.0.3.2)
-      activejob (= 6.0.3.2)
-      activerecord (= 6.0.3.2)
-      activestorage (= 6.0.3.2)
-      activesupport (= 6.0.3.2)
-      mail (>= 2.7.1)
-    actionmailer (6.0.3.2)
-      actionpack (= 6.0.3.2)
-      actionview (= 6.0.3.2)
-      activejob (= 6.0.3.2)
-      mail (~> 2.5, >= 2.5.4)
-      rails-dom-testing (~> 2.0)
-    actionpack (6.0.3.2)
-      actionview (= 6.0.3.2)
-      activesupport (= 6.0.3.2)
-      rack (~> 2.0, >= 2.0.8)
-      rack-test (>= 0.6.3)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (6.0.3.2)
-      actionpack (= 6.0.3.2)
-      activerecord (= 6.0.3.2)
-      activestorage (= 6.0.3.2)
-      activesupport (= 6.0.3.2)
-      nokogiri (>= 1.8.5)
-    actionview (6.0.3.2)
-      activesupport (= 6.0.3.2)
-      builder (~> 3.1)
-      erubi (~> 1.4)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activejob (6.0.3.2)
-      activesupport (= 6.0.3.2)
-      globalid (>= 0.3.6)
-    activemodel (6.0.3.2)
-      activesupport (= 6.0.3.2)
-    activerecord (6.0.3.2)
-      activemodel (= 6.0.3.2)
-      activesupport (= 6.0.3.2)
-    activestorage (6.0.3.2)
-      actionpack (= 6.0.3.2)
-      activejob (= 6.0.3.2)
-      activerecord (= 6.0.3.2)
-      marcel (~> 0.3.1)
-    activesupport (6.0.3.2)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-      zeitwerk (~> 2.2, >= 2.2.2)
-    bcrypt (3.1.15)
-    builder (3.2.4)
-    concurrent-ruby (1.1.7)
-    crass (1.0.6)
-    erubi (1.9.0)
-    faraday (1.0.1)
-      multipart-post (>= 1.2, < 3)
-    globalid (0.4.2)
-      activesupport (>= 4.2.0)
-    hashie (4.1.0)
-    i18n (1.8.5)
-      concurrent-ruby (~> 1.0)
-    jwt (2.2.1)
-    loofah (2.6.0)
-      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)
-    method_source (1.0.0)
-    mimemagic (0.3.5)
-    mini_mime (1.0.2)
-    mini_portile2 (2.4.0)
-    minitest (5.14.1)
-    mocha (1.11.2)
-    multi_json (1.15.0)
-    multi_xml (0.6.0)
-    multipart-post (2.1.1)
-    nio4r (2.5.2)
-    nokogiri (1.10.10)
-      mini_portile2 (~> 2.4.0)
-    oauth2 (1.4.4)
-      faraday (>= 0.8, < 2.0)
-      jwt (>= 1.0, < 3.0)
-      multi_json (~> 1.3)
-      multi_xml (~> 0.5)
-      rack (>= 1.2, < 3)
-    omniauth (1.9.1)
-      hashie (>= 3.4.6)
-      rack (>= 1.6.2, < 3)
-    omniauth-facebook (6.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.2.3)
-    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.3.2)
-      actioncable (= 6.0.3.2)
-      actionmailbox (= 6.0.3.2)
-      actionmailer (= 6.0.3.2)
-      actionpack (= 6.0.3.2)
-      actiontext (= 6.0.3.2)
-      actionview (= 6.0.3.2)
-      activejob (= 6.0.3.2)
-      activemodel (= 6.0.3.2)
-      activerecord (= 6.0.3.2)
-      activestorage (= 6.0.3.2)
-      activesupport (= 6.0.3.2)
-      bundler (>= 1.3.0)
-      railties (= 6.0.3.2)
-      sprockets-rails (>= 2.0.0)
-    rails-dom-testing (2.0.3)
-      activesupport (>= 4.2.0)
-      nokogiri (>= 1.6)
-    rails-html-sanitizer (1.3.0)
-      loofah (~> 2.3)
-    railties (6.0.3.2)
-      actionpack (= 6.0.3.2)
-      activesupport (= 6.0.3.2)
-      method_source
-      rake (>= 0.8.7)
-      thor (>= 0.20.3, < 2.0)
-    rake (13.0.1)
-    rdoc (6.2.1)
-    responders (3.0.1)
-      actionpack (>= 5.0)
-      railties (>= 5.0)
-    ruby-openid (2.9.2)
-    sprockets (4.0.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.2)
-    thor (1.0.1)
-    thread_safe (0.3.6)
-    timecop (0.9.1)
-    tzinfo (1.2.7)
-      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.3)
-      websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.5)
-    zeitwerk (2.4.0)
-
-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)
-  timecop
-  webrat (= 0.7.3)
-
-BUNDLED WITH
-   1.17.3
--- a/guides/bug_report_templates/integration_test.rb
+++ b/guides/bug_report_templates/integration_test.rb
@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 begin
  require 'bundler/inline'
 rescue LoadError => e
@@ -76,7 +74,7 @@ end
 class TestController < ApplicationController
  include Rails.application.routes.url_helpers

-  before_action :authenticate_user!
+  before_filter :authenticate_user!

  def index
    render plain: 'Home'
--- a/lib/devise.rb
+++ b/lib/devise.rb
@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 require 'rails'
 require 'active_support/core_ext/numeric/time'
 require 'active_support/dependencies'
@@ -18,7 +16,6 @@ module Devise
  autoload :TestHelpers,        'devise/test_helpers'
  autoload :TimeInflector,      'devise/time_inflector'
  autoload :TokenGenerator,     'devise/token_generator'
-  autoload :SecretKeyFinder,    'devise/secret_key_finder'

  module Controllers
    autoload :Helpers,        'devise/controllers/helpers'
@@ -71,7 +68,7 @@ module Devise

  # The number of times to hash the password.
  mattr_accessor :stretches
-  @@stretches = 12
+  @@stretches = 11

  # The default key used when authenticating over http auth.
  mattr_accessor :http_authentication_key
@@ -152,7 +149,7 @@ module Devise
  mattr_accessor :timeout_in
  @@timeout_in = 30.minutes

-  # Used to hash the password. Please generate one with rails secret.
+  # Used to hash the password. Please generate one with rake secret.
  mattr_accessor :pepper
  @@pepper = nil

@@ -293,9 +290,9 @@ module Devise
  mattr_accessor :token_generator
  @@token_generator = nil

-  # When set to false, changing a password does not automatically sign in a user
-  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")
--- a/lib/devise/controllers/helpers.rb
+++ b/lib/devise/controllers/helpers.rb
@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module Devise
  module Controllers
    # Those helpers are convenience methods added to ApplicationController.
@@ -36,14 +34,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)
@@ -57,9 +55,9 @@ module Devise
              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,7 +111,7 @@ 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
@@ -252,7 +250,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
@@ -268,7 +266,7 @@ module Devise
      # Check if flash messages should be emitted. Default is to do it on
      # navigational formats
      def is_flashing_format?
-        request.respond_to?(:flash) && is_navigational_format?
+        is_navigational_format?
      end

      private
--- a/lib/devise/controllers/rememberable.rb
+++ b/lib/devise/controllers/rememberable.rb
@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module Devise
  module Controllers
    # A module that may be optionally included in a controller in order
--- a/lib/devise/controllers/scoped_views.rb
+++ b/lib/devise/controllers/scoped_views.rb
@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module Devise
  module Controllers
    module ScopedViews
--- a/lib/devise/controllers/sign_in_out.rb
+++ b/lib/devise/controllers/sign_in_out.rb
@@ -1,16 +1,11 @@
-# frozen_string_literal: true
-
 module Devise
  module Controllers
    # Provide sign in and sign out functionality.
    # Included by default in all controllers.
    module SignInOut
      # Return true if the given scope is signed in session. If no scope given, return
-      # true if any scope is signed in. This will run authentication hooks, which may
-      # 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)
+      # true if any scope is signed in. Does not run authentication hooks.
+      def signed_in?(scope=nil)
        [scope || Devise.mappings.keys].flatten.any? do |_scope|
          warden.authenticate?(scope: _scope)
        end
@@ -19,9 +14,6 @@ module Devise
      # Sign in a user that already was authenticated. This helper is useful for logging
      # users in after sign up. All options given to sign_in is passed forward
      # 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/master/app/controllers/devise/sessions_controller.rb#L7
      #
      # Examples:
      #
@@ -77,7 +69,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 +84,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
--- a/lib/devise/controllers/store_location.rb
+++ b/lib/devise/controllers/store_location.rb
@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 require "uri"

 module Devise
@@ -35,9 +33,12 @@ module Devise
      #
      def store_location_for(resource_or_scope, location)
        session_key = stored_location_key_for(resource_or_scope)
-        
-        path = extract_path_from_location(location)
-        session[session_key] = path if path
+        uri = parse_uri(location)
+        if uri
+          path = [uri.path.sub(/\A\/+/, '/'), uri.query].compact.join('?')
+          path = [path, uri.fragment].compact.join('#')
+          session[session_key] = path
+        end
      end

      private
@@ -52,25 +53,6 @@ module Devise
        scope = Devise::Mapping.find_scope!(resource_or_scope)
        "#{scope}_return_to"
      end
-
-      def extract_path_from_location(location)
-        uri = parse_uri(location)
-
-        if uri 
-          path = remove_domain_from_uri(uri)
-          path = add_fragment_back_to_path(uri, path)
-
-          path
-        end
-      end
-
-      def remove_domain_from_uri(uri)
-        [uri.path.sub(/\A\/+/, '/'), uri.query].compact.join('?')
-      end
-
-      def add_fragment_back_to_path(uri, path)
-        [path, uri.fragment].compact.join('#')
-      end
    end
  end
 end
--- a/lib/devise/controllers/url_helpers.rb
+++ b/lib/devise/controllers/url_helpers.rb
@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module Devise
  module Controllers
    # Create url helpers to be used with resource/scope configuration. Acts as
@@ -34,7 +32,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/delegator.rb
+++ b/lib/devise/delegator.rb
@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module Devise
  # Checks the scope in the given environment and returns the associated failure app.
  class Delegator
--- a/lib/devise/encryptor.rb
+++ b/lib/devise/encryptor.rb
@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 require 'bcrypt'

 module Devise
--- a/lib/devise/failure_app.rb
+++ b/lib/devise/failure_app.rb
@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 require "action_controller/metal"

 module Devise
@@ -71,6 +69,7 @@ module Devise
      end

      flash.now[:alert] = i18n_message(:invalid) if is_flashing_format?
+      # self.response = recall_app(warden_options[:recall]).call(env)
      self.response = recall_app(warden_options[:recall]).call(request.env)
    end

@@ -106,7 +105,7 @@ module Devise
        options[:authentication_keys] = keys.join(I18n.translate(:"support.array.words_connector"))
        options = i18n_options(options)

-        I18n.t(:"#{scope}.#{message}", **options)
+        I18n.t(:"#{scope}.#{message}", options)
      else
        message.to_s
      end
@@ -143,20 +142,11 @@ module Devise

      opts[:format] = request_format unless skip_format?

+      opts[:script_name] = relative_url_root if relative_url_root?
+
      router_name = Devise.mappings[scope].router_name || Devise.available_router_name
      context = send(router_name)

-      if relative_url_root?
-        opts[:script_name] = relative_url_root
-
-      # We need to add the rootpath to `script_name` manually for applications that use a Rails
-      # version lower than 5.1. Otherwise, it is going to generate a wrong path for Engines
-      # that use Devise. Remove it when the support of Rails 5.0 is dropped.
-      elsif root_path_defined?(context) && !rails_51_and_up?
-        rootpath = context.routes.url_helpers.root_path
-        opts[:script_name] = rootpath.chomp('/') if rootpath.length > 1
-      end
-
      if context.respond_to?(route)
        context.send(route, opts)
      elsif respond_to?(:root_url)
@@ -250,7 +240,7 @@ module Devise
    # Check if flash messages should be emitted. Default is to do it on
    # navigational formats
    def is_flashing_format?
-      request.respond_to?(:flash) && is_navigational_format?
+      is_navigational_format?
    end

    def request_format
@@ -268,17 +258,5 @@ module Devise
    def relative_url_root?
      relative_url_root.present?
    end
-
-    ActiveSupport.run_load_hooks(:devise_failure_app, self)
-
-    private
-
-    def root_path_defined?(context)
-      defined?(context.routes) && context.routes.url_helpers.respond_to?(:root_path)
-    end
-
-    def rails_51_and_up?
-      Rails.gem_version >= Gem::Version.new("5.1")
-    end
  end
 end
--- a/lib/devise/hooks/activatable.rb
+++ b/lib/devise/hooks/activatable.rb
@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 # Deny user access whenever their account is not active yet.
 # We need this as hook to validate the user activity on each request
 # and in case the user is using other strategies beside Devise ones.
--- a/lib/devise/hooks/csrf_cleaner.rb
+++ b/lib/devise/hooks/csrf_cleaner.rb
@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 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?
--- a/lib/devise/hooks/forgetable.rb
+++ b/lib/devise/hooks/forgetable.rb
@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 # Before logout hook to forget the user in the given scope, if it responds
 # to forget_me! Also clear remember token to ensure the user won't be
 # remembered again. Notice that we forget the user unless the record is not persisted.
--- a/lib/devise/hooks/lockable.rb
+++ b/lib/devise/hooks/lockable.rb
@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 # 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|
--- a/lib/devise/hooks/proxy.rb
+++ b/lib/devise/hooks/proxy.rb
@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module Devise
  module Hooks
    # A small warden proxy so we can remember, forget and
--- a/lib/devise/hooks/rememberable.rb
+++ b/lib/devise/hooks/rememberable.rb
@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 Warden::Manager.after_set_user except: :fetch do |record, warden, options|
  scope = options[:scope]
  if record.respond_to?(:remember_me) && options[:store] != false &&
--- a/lib/devise/hooks/timeoutable.rb
+++ b/lib/devise/hooks/timeoutable.rb
@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 # Each time a record is set we check whether its session has already timed out
 # or not, based on last request time. If so, the record is logged out and
 # redirected to the sign in page. Also, each time the request comes and the
@@ -21,8 +19,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,5 +1,3 @@
-# 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
--- a/lib/devise/mailers/helpers.rb
+++ b/lib/devise/mailers/helpers.rb
@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module Devise
  module Mailers
    module Helpers
--- a/lib/devise/mapping.rb
+++ b/lib/devise/mapping.rb
@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module Devise
  # Responsible for handling devise mappings and routes configuration. Each
  # resource configured by devise_for in routes is actually creating a mapping
@@ -46,7 +44,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
@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module Devise
  module Models
    class MissingAttribute < StandardError
--- a/lib/devise/models/authenticatable.rb
+++ b/lib/devise/models/authenticatable.rb
@@ -1,5 +1,4 @@
-# frozen_string_literal: true
-
+require 'active_model/version'
 require 'devise/hooks/activatable'
 require 'devise/hooks/csrf_cleaner'

@@ -103,8 +102,8 @@ module Devise
      # and passing a new list of attributes you want to exempt. All attributes
      # 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 ||= {}
+        options[:except] = Array(options[:except])

        if options[:force_except]
          options[:except].concat Array(options[:force_except])
@@ -133,18 +132,16 @@ module Devise
      # This is an internal method called every time Devise needs
      # to send a notification/mail. This can be overridden if you
      # need to customize the e-mail delivery logic. For instance,
-      # if you are using a queue to deliver e-mails (active job, delayed
-      # job, sidekiq, resque, etc), you must add the delivery to the queue
+      # if you are using a queue to deliver e-mails (delayed job,
+      # sidekiq, resque, etc), you must add the delivery to the queue
      # just after the transaction was committed. To achieve this,
      # you can override send_devise_notification to store the
-      # deliveries until the after_commit callback is triggered.
-      #
-      # The following example uses Active Job's `deliver_later` :
+      # deliveries until the after_commit callback is triggered:
      #
      #     class User
      #       devise :database_authenticatable, :confirmable
      #
-      #       after_commit :send_pending_devise_notifications
+      #       after_commit :send_pending_notifications
      #
      #       protected
      #
@@ -152,45 +149,39 @@ 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?
-      #           pending_devise_notifications << [notification, args]
+      #         if new_record? || changed?
+      #           pending_notifications << [notification, args]
      #         else
-      #           render_and_send_devise_message(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
      #         end
      #       end
      #
-      #       private
-      #
-      #       def send_pending_devise_notifications
-      #         pending_devise_notifications.each do |notification, args|
-      #           render_and_send_devise_message(notification, *args)
+      #       def send_pending_notifications
+      #         pending_notifications.each do |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
      #         end
      #
      #         # Empty the pending notifications array because the
      #         # after_commit hook can be called multiple times which
      #         # could cause multiple emails to be sent.
-      #         pending_devise_notifications.clear
+      #         pending_notifications.clear
      #       end
      #
-      #       def pending_devise_notifications
-      #         @pending_devise_notifications ||= []
+      #       def pending_notifications
+      #         @pending_notifications ||= []
      #       end
-      #
-      #       def render_and_send_devise_message(notification, *args)
-      #         message = devise_mailer.send(notification, self, *args)
-      #
-      #         # 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
-      #         end
-      #       end
-      #
      #     end
      #
      def send_devise_notification(notification, *args)
@@ -265,38 +256,46 @@ module Devise
        #   end
        #
        # Finally, notice that Devise also queries for users in other scenarios
-        # besides authentication, for example when retrieving a user to send
+        # besides authentication, for example when retrieving an user to send
        # an e-mail for password reset. In such cases, find_for_authentication
        # is not called.
        def find_for_authentication(tainted_conditions)
          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:
-          attributes.try(:permit!)
-          attributes = attributes.to_h.with_indifferent_access
-                                 .slice(*required_attributes)
-                                 .delete_if { |key, value| value.blank? }
+        def find_or_initialize_with_errors(required_attributes, attributes, error=:invalid) #:nodoc:
+          attributes = if attributes.respond_to? :permit!
+            attributes.slice(*required_attributes).permit!.to_h.with_indifferent_access
+          else
+            attributes.with_indifferent_access.slice(*required_attributes)
+          end
+          attributes.delete_if { |key, value| value.blank? }

          if attributes.size == required_attributes.size
-            record = find_first_by_auth_conditions(attributes) and return record
+            record = find_first_by_auth_conditions(attributes)
          end

-          new(devise_parameter_filter.filter(attributes)).tap do |record|
+          unless record
+            record = new
+
            required_attributes.each do |key|
-              record.errors.add(key, attributes[key].blank? ? :blank : error)
+              value = attributes[key]
+              record.send("#{key}=", value)
+              record.errors.add(key, value.present? ? error : :blank)
            end
          end
+
+          record
        end

        protected
--- a/lib/devise/models/confirmable.rb
+++ b/lib/devise/models/confirmable.rb
@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module Devise
  module Models
    # Confirmable is responsible to verify if an account is already confirmed to
@@ -48,7 +46,7 @@ module Devise
      included do
        before_create :generate_confirmation_token, if: :confirmation_required?
        after_create :skip_reconfirmation_in_callback!, if: :send_confirmation_notification?
-        if defined?(ActiveRecord) && self < ActiveRecord::Base # ActiveRecord
+        if respond_to?(:after_commit) # 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 +74,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,
@@ -211,10 +209,7 @@ module Devise
        #   confirmation_period_valid?   # will always return true
        #
        def confirmation_period_valid?
-          return true if self.class.allow_unconfirmed_access_for.nil?
-          return false if self.class.allow_unconfirmed_access_for == 0.days
-
-          confirmation_sent_at && confirmation_sent_at.utc >= self.class.allow_unconfirmed_access_for.ago
+          self.class.allow_unconfirmed_access_for.nil? || (confirmation_sent_at && confirmation_sent_at.utc >= self.class.allow_unconfirmed_access_for.ago)
        end

        # Checks if the user confirmation happens before the token becomes invalid
@@ -334,7 +329,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)
@@ -348,19 +343,7 @@ module Devise
        # If the user is already confirmed, create an error for the user
        # Options must have the confirmation_token
        def confirm_by_token(confirmation_token)
-          # When the `confirmation_token` parameter is blank, if there are any users with a blank
-          # `confirmation_token` in the database, the first one would be confirmed here.
-          # The error is being manually added here to ensure no users are confirmed by mistake.
-          # This was done in the model for convenience, since validation errors are automatically
-          # displayed in the view.
-          if confirmation_token.blank?
-            confirmable = new
-            confirmable.errors.add(:confirmation_token, :blank)
-            return confirmable
-          end
-
          confirmable = find_first_by_auth_conditions(confirmation_token: confirmation_token)
-
          unless confirmable
            confirmation_digest = Devise.token_generator.digest(self, :confirmation_token, confirmation_token)
            confirmable = find_or_initialize_with_error_by(:confirmation_token, confirmation_digest)
--- a/lib/devise/models/database_authenticatable.rb
+++ b/lib/devise/models/database_authenticatable.rb
@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 require 'devise/strategies/database_authenticatable'

 module Devise
@@ -7,16 +5,12 @@ 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_for:
    #
    #   * +pepper+: a random string used to provide a more secure hash. Use
-    #     `rails secret` to generate new keys.
+    #     `rake secret` to generate new keys.
    #
    #   * +stretches+: the cost given to bcrypt.
    #
@@ -39,22 +33,6 @@ module Devise
        attr_accessor :password_confirmation
      end

-      def initialize(*args, &block)
-        @skip_email_changed_notification = false
-        @skip_password_change_notification = false
-        super 
-      end
-
-      # Skips sending the email changed notification after_update
-      def skip_email_changed_notification!
-        @skip_email_changed_notification = true
-      end
-
-      # Skips sending the password change notification after_update
-      def skip_password_change_notification!
-        @skip_password_change_notification = true
-      end
-
      def self.required_fields(klass)
        [:encrypted_password] + klass.authentication_keys
      end
@@ -85,15 +63,6 @@ module Devise
      # 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
-
        current_password = params.delete(:current_password)

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

        result = if valid_password?(current_password)
-          update(params, *options)
+          update_attributes(params, *options)
        else
-          assign_attributes(params, *options)
-          valid?
-          errors.add(:current_password, current_password.blank? ? :blank : :invalid)
+          self.assign_attributes(params, *options)
+          self.valid?
+          self.errors.add(:current_password, current_password.blank? ? :blank : :invalid)
          false
        end

@@ -127,19 +96,10 @@ module Devise
      #   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
-
        params.delete(:password)
        params.delete(:password_confirmation)

-        result = update(params, *options)
+        result = update_attributes(params, *options)
        clean_up_passwords
        result
      end
@@ -151,8 +111,8 @@ module Devise
        result = if valid_password?(current_password)
          destroy
        else
-          valid?
-          errors.add(:current_password, current_password.blank? ? :blank : :invalid)
+          self.valid?
+          self.errors.add(:current_password, current_password.blank? ? :blank : :invalid)
          false
        end

@@ -199,7 +159,7 @@ 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)
@@ -207,21 +167,21 @@ module Devise

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

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

--- a/lib/devise/models/lockable.rb
+++ b/lib/devise/models/lockable.rb
@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 require "devise/hooks/lockable"

 module Devise
@@ -101,7 +99,8 @@ module Devise
        if super && !access_locked?
          true
        else
-          increment_failed_attempts
+          self.failed_attempts ||= 0
+          self.failed_attempts += 1
          if attempts_exceeded?
            lock_access! unless access_locked?
          else
@@ -110,11 +109,6 @@ module Devise
          false
        end
      end
-      
-      def increment_failed_attempts
-        self.class.increment_counter(:failed_attempts, id)
-        reload
-      end

      def unauthenticated_message
        # If set to paranoid mode, do not show the locked message because it
@@ -168,7 +162,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
@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 require 'devise/omniauth'

 module Devise
--- a/lib/devise/models/recoverable.rb
+++ b/lib/devise/models/recoverable.rb
@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module Devise
  module Models

@@ -131,7 +129,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
@@ -142,7 +140,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/registerable.rb
+++ b/lib/devise/models/registerable.rb
@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module Devise
  module Models
    # Registerable is responsible for everything related to registering a new
@@ -21,8 +19,6 @@ module Devise
        def new_with_session(params, session)
          new(params)
        end
-
-        Devise::Models.config(self, :sign_in_after_change_password)
      end
    end
  end
--- a/lib/devise/models/rememberable.rb
+++ b/lib/devise/models/rememberable.rb
@@ -1,12 +1,10 @@
-# frozen_string_literal: true
-
 require 'devise/strategies/rememberable'
 require 'devise/hooks/rememberable'
 require 'devise/hooks/forgetable'

 module Devise
  module Models
-    # Rememberable manages generating and clearing token for remembering the user
+    # Rememberable manages generating and clearing token for remember the user
    # from a saved cookie. Rememberable also has utility methods for dealing
    # with serializing the user into the cookie and back from the cookie, trying
    # to lookup the record based on the saved information.
@@ -102,7 +100,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
@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 require 'devise/hooks/timeoutable'

 module Devise
--- a/lib/devise/models/trackable.rb
+++ b/lib/devise/models/trackable.rb
@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 require 'devise/hooks/trackable'

 module Devise
@@ -22,7 +20,7 @@ module Devise
        self.last_sign_in_at     = old_current || new_current
        self.current_sign_in_at  = new_current

-        old_current, new_current = self.current_sign_in_ip, extract_ip_from(request)
+        old_current, new_current = self.current_sign_in_ip, request.remote_ip
        self.last_sign_in_ip     = old_current || new_current
        self.current_sign_in_ip  = new_current

@@ -31,21 +29,9 @@ module Devise
      end

      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.
-        return if new_record?
-
        update_tracked_fields(request)
        save(validate: false)
      end
-
-      protected
-
-      def extract_ip_from(request)
-        request.remote_ip
-      end
-
    end
  end
 end
--- a/lib/devise/models/validatable.rb
+++ b/lib/devise/models/validatable.rb
@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module Devise
  module Models
    # Validatable creates all needed validations for a user email and password.
@@ -12,7 +10,7 @@ module 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.
+    #   * +password_length+: a range expressing password length. Defaults to 8..72.
    #
    module Validatable
      # All validations used by this module.
@@ -30,7 +28,7 @@ module Devise
        base.class_eval do
          validates_presence_of   :email, if: :email_required?
          if Devise.activerecord51?
-            validates_uniqueness_of :email, allow_blank: true, case_sensitive: true, if: :will_save_change_to_email?
+            validates_uniqueness_of :email, allow_blank: 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?
--- a/lib/devise/modules.rb
+++ b/lib/devise/modules.rb
@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 require 'active_support/core_ext/object/with_options'

 Devise.with_options model: true do |d|
--- a/lib/devise/omniauth.rb
+++ b/lib/devise/omniauth.rb
@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 begin
  require "omniauth"
  require "omniauth/version"
--- a/lib/devise/omniauth/config.rb
+++ b/lib/devise/omniauth/config.rb
@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module Devise
  module OmniAuth
    class StrategyNotFound < NameError
--- a/lib/devise/omniauth/url_helpers.rb
+++ b/lib/devise/omniauth/url_helpers.rb
@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module Devise
  module OmniAuth
    module UrlHelpers
--- a/lib/devise/orm/active_record.rb
+++ b/lib/devise/orm/active_record.rb
@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 require 'orm_adapter/adapters/active_record'

 ActiveSupport.on_load(:active_record) do
--- a/lib/devise/orm/mongoid.rb
+++ b/lib/devise/orm/mongoid.rb
@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 ActiveSupport.on_load(:mongoid) do
  require 'orm_adapter/adapters/mongoid'

--- a/lib/devise/parameter_filter.rb
+++ b/lib/devise/parameter_filter.rb
@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module Devise
  class ParameterFilter
    def initialize(case_insensitive_keys, strip_whitespace_keys)
@@ -18,8 +16,6 @@ module Devise

    def filtered_hash_by_method_for_given_keys(conditions, method, condition_keys)
      condition_keys.each do |k|
-        next unless conditions.key?(k)
-
        value = conditions[k]
        conditions[k] = value.send(method) if value.respond_to?(method)
      end
--- a/lib/devise/parameter_sanitizer.rb
+++ b/lib/devise/parameter_sanitizer.rb
@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module Devise
  # The +ParameterSanitizer+ deals with permitting specific parameters values
  # for each +Devise+ scope in the application.
@@ -135,19 +133,7 @@ module Devise
    end

    def default_params
-      if hashable_resource_params?
-        @params.fetch(@resource_name)
-      else
-        empty_params
-      end
-    end
-
-    def hashable_resource_params?
-      @params[@resource_name].respond_to?(:permit)
-    end
-
-    def empty_params
-      ActionController::Parameters.new({})
+      @params.fetch(@resource_name, {})
    end

    def permit_keys(parameters, keys)
--- a/lib/devise/rails.rb
+++ b/lib/devise/rails.rb
@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 require 'devise/rails/routes'
 require 'devise/rails/warden_compat'

@@ -34,7 +32,11 @@ module Devise
    end

    initializer "devise.secret_key" do |app|
-      Devise.secret_key ||= Devise::SecretKeyFinder.new(app).find
+      if app.respond_to?(:secrets)
+        Devise.secret_key ||= app.secrets.secret_key_base
+      elsif app.config.respond_to?(:secret_key_base)
+        Devise.secret_key ||= app.config.secret_key_base
+      end

      Devise.token_generator ||=
        if secret_key = Devise.secret_key
--- a/lib/devise/rails/routes.rb
+++ b/lib/devise/rails/routes.rb
@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 require "active_support/core_ext/object/try"
 require "active_support/core_ext/hash/slice"

@@ -135,10 +133,10 @@ module ActionDispatch::Routing
    #  * failure_app: a rack app which is invoked whenever there is a failure. Strings representing a given
    #    are also allowed as parameter.
    #
-    #  * sign_out_via: the HTTP method(s) accepted for the :sign_out action (default: :delete),
+    #  * sign_out_via: the HTTP method(s) accepted for the :sign_out action (default: :get),
    #    if you wish to restrict this to accept only :post or :delete requests you should do:
    #
-    #      devise_for :users, sign_out_via: [:get, :post]
+    #      devise_for :users, sign_out_via: [:post, :delete]
    #
    #    You need to make sure that your sign_out controls trigger a request with a matching HTTP method.
    #
@@ -287,7 +285,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 +309,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 +326,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 +472,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/rails/warden_compat.rb
+++ b/lib/devise/rails/warden_compat.rb
@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module Warden::Mixins::Common
  def request
    @request ||= ActionDispatch::Request.new(env)
--- a/lib/devise/secret_key_finder.rb
+++ b/lib/devise/secret_key_finder.rb
@@ -1,27 +0,0 @@
-# frozen_string_literal: true
-
-module Devise
-  class SecretKeyFinder
-    def initialize(application)
-      @application = application
-    end
-
-    def find
-      if @application.respond_to?(:credentials) && key_exists?(@application.credentials)
-        @application.credentials.secret_key_base
-      elsif @application.respond_to?(:secrets) && key_exists?(@application.secrets)
-        @application.secrets.secret_key_base
-      elsif @application.config.respond_to?(:secret_key_base) && key_exists?(@application.config)
-        @application.config.secret_key_base
-      elsif @application.respond_to?(:secret_key_base) && key_exists?(@application)
-        @application.secret_key_base
-      end
-    end
-
-    private
-
-    def key_exists?(object)
-      object.secret_key_base.present?
-    end
-  end
-end
--- a/lib/devise/strategies/authenticatable.rb
+++ b/lib/devise/strategies/authenticatable.rb
@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 require 'devise/strategies/base'

 module Devise
@@ -28,7 +26,7 @@ module Devise
    private

      # Receives a resource and check if it is valid by calling valid_for_authentication?
-      # A block that will be triggered while validating can be optionally
+      # An optional block that will be triggered while validating can be optionally
      # given as parameter. Check Devise::Models::Authenticatable.valid_for_authentication?
      # for more information.
      #
--- a/lib/devise/strategies/base.rb
+++ b/lib/devise/strategies/base.rb
@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module Devise
  module Strategies
    # Base strategy for Devise. Responsible for verifying correct scope and mapping.
--- a/lib/devise/strategies/database_authenticatable.rb
+++ b/lib/devise/strategies/database_authenticatable.rb
@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 require 'devise/strategies/authenticatable'

 module Devise
@@ -16,13 +14,8 @@ module Devise
          success!(resource)
        end

-        # In paranoid mode, hash the password even when a resource doesn't exist for the given authentication key.
-        # This is necessary to prevent enumeration attacks - e.g. the request is faster when a resource doesn't
-        # exist in the database if the password hashing algorithm is not called.
        mapping.to.new.password = password if !hashed && Devise.paranoid
-        unless resource
-          Devise.paranoid ? fail(:invalid) : fail(:not_found_in_database)
-        end
+        fail(:not_found_in_database) unless resource
      end
    end
  end
--- a/lib/devise/strategies/rememberable.rb
+++ b/lib/devise/strategies/rememberable.rb
@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 require 'devise/strategies/authenticatable'

 module Devise
--- a/lib/devise/test/controller_helpers.rb
+++ b/lib/devise/test/controller_helpers.rb
@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module Devise
  module Test
    # `Devise::Test::ControllerHelpers` provides a facility to test controllers
@@ -37,8 +35,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 +137,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
@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module Devise
  # Devise::Test::IntegrationHelpers is a helper module for facilitating
  # authentication on Rails integration tests to bypass the required steps for
@@ -28,7 +26,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/test_helpers.rb
+++ b/lib/devise/test_helpers.rb
@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module Devise
  module TestHelpers
    def self.included(base)
--- a/lib/devise/time_inflector.rb
+++ b/lib/devise/time_inflector.rb
@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 require "active_support/core_ext/module/delegation"

 module Devise
--- a/lib/devise/token_generator.rb
+++ b/lib/devise/token_generator.rb
@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 require 'openssl'

 module Devise
--- a/lib/devise/version.rb
+++ b/lib/devise/version.rb
@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module Devise
-  VERSION = "4.7.3".freeze
+  VERSION = "4.3.0".freeze
 end
--- a/lib/generators/active_record/devise_generator.rb
+++ b/lib/generators/active_record/devise_generator.rb
@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 require 'rails/generators/active_record'
 require 'generators/devise/orm_helpers'

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

-      class_option :primary_key_type, type: :string, desc: "The type for primary key"
-
      include Devise::Generators::OrmHelpers
      source_root File.expand_path("../templates", __FILE__)

      def copy_devise_migration
        if (behavior == :invoke && model_exists?) || (behavior == :revoke && migration_exists?(table_name))
-          migration_template "migration_existing.rb", "#{migration_path}/add_devise_to_#{table_name}.rb", migration_version: migration_version
+          migration_template "migration_existing.rb", "db/migrate/add_devise_to_#{table_name}.rb", migration_version: migration_version
        else
-          migration_template "migration.rb", "#{migration_path}/devise_create_#{table_name}.rb", migration_version: migration_version
+          migration_template "migration.rb", "db/migrate/devise_create_#{table_name}.rb", migration_version: migration_version
        end
      end

@@ -54,11 +50,11 @@ module ActiveRecord
      t.datetime :remember_created_at

      ## Trackable
-      # t.integer  :sign_in_count, default: 0, null: false
-      # t.datetime :current_sign_in_at
-      # t.datetime :last_sign_in_at
-      # t.#{ip_column} :current_sign_in_ip
-      # t.#{ip_column} :last_sign_in_ip
+      t.integer  :sign_in_count, default: 0, null: false
+      t.datetime :current_sign_in_at
+      t.datetime :last_sign_in_at
+      t.#{ip_column} :current_sign_in_ip
+      t.#{ip_column} :last_sign_in_ip

      ## Confirmable
      # t.string   :confirmation_token
@@ -82,8 +78,8 @@ RUBY
        postgresql?
      end

-      def rails5_and_up?
-        Rails::VERSION::MAJOR >= 5
+      def rails5?
+        Rails.version.start_with? '5'
      end

      def postgresql?
@@ -92,19 +88,10 @@ RUBY
      end

     def migration_version
-       if rails5_and_up?
+       if rails5?
         "[#{Rails::VERSION::MAJOR}.#{Rails::VERSION::MINOR}]"
       end
     end
-
-     def primary_key_type
-       primary_key_string if rails5_and_up?
-     end
-
-     def primary_key_string
-       key_string = options[:primary_key_type]
-       ", id: :#{key_string}" if key_string
-     end
    end
  end
 end
--- a/lib/generators/active_record/templates/migration.rb
+++ b/lib/generators/active_record/templates/migration.rb
@@ -1,8 +1,6 @@
-# frozen_string_literal: true
-
 class DeviseCreate<%= table_name.camelize %> < ActiveRecord::Migration<%= migration_version %>
  def change
-    create_table :<%= table_name %><%= primary_key_type %> do |t|
+    create_table :<%= table_name %> do |t|
 <%= migration_data -%>

 <% attributes.each do |attribute| -%>
--- a/Show More
+++ b/Show More