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/sessions_controller.rb
+++ b/app/controllers/auth/sessions_controller.rb
@@ -1,8 +1,6 @@
 # frozen_string_literal: true

 class Auth::SessionsController < Devise::SessionsController
-  include Devise::Controllers::Rememberable
-
  layout 'auth'

  skip_before_action :require_no_authentication, only: [:create]
@@ -156,7 +154,6 @@ class Auth::SessionsController < Devise::SessionsController
    clear_attempt_from_session

    user.update_sign_in!(request, new_sign_in: true)
-    remember_me(user)
    sign_in(user)
    flash.delete(:notice)