Merge branch 'main' into glitch-soc/merge-upstream

2021-11-06 00:15:38 +01:00
parent e0f3962697 6da135a493
commit 4bb6b1a1e7
24 changed files with 1097 additions and 825 deletions
--- a/app/controllers/auth/registrations_controller.rb
+++ b/app/controllers/auth/registrations_controller.rb
@ -1,7 +1,6 @@
 # frozen_string_literal: true

 class Auth::RegistrationsController < Devise::RegistrationsController
-  include Devise::Controllers::Rememberable
  include RegistrationSpamConcern

  layout :determine_layout
@ -31,8 +30,6 @@ class Auth::RegistrationsController < Devise::RegistrationsController
    super do |resource|
      if resource.saved_change_to_encrypted_password?
        resource.clear_other_sessions(current_session.session_id)
-        resource.forget_me!
-        remember_me(resource)
      end
    end
  end