diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2021-11-06 00:33:55 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-06 00:33:55 +0100 |
| commit | a25839340e93b1e93b7b99b0f65fa7da7d62bad2 (patch) | |
| tree | a329d65c115e752c3be5c262ebf96f69cd13861a /app/controllers/auth/sessions_controller.rb | |
| parent | e0f39626973fd9f5cce2d4cd3b166fb47e9c9059 (diff) | |
| parent | 4bb6b1a1e788abac7d1745e0f4eb72ad4d4ec110 (diff) | |
Merge pull request #1628 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/controllers/auth/sessions_controller.rb')
| -rw-r--r-- | app/controllers/auth/sessions_controller.rb | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/app/controllers/auth/sessions_controller.rb b/app/controllers/auth/sessions_controller.rb index 839e9bdb9..2636b4718 100644 --- 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) |