Merge remote-tracking branch 'parent/main' into upstream-20240128

2025-01-28 18:02:01 +09:00 · 2025-01-28 18:02:01 +09:00 · 3e065f4e12
commit 3e065f4e12
parent bfa1700909 6646a0a9fa
200 changed files with 2190 additions and 738 deletions
--- a/app/controllers/auth/sessions_controller.rb
+++ b/app/controllers/auth/sessions_controller.rb
@ -73,7 +73,7 @@ class Auth::SessionsController < Devise::SessionsController
  end

  def user_params
-    params.require(:user).permit(:email, :password, :otp_attempt, :disable_css, credential: {})
+    params.expect(user: [:email, :password, :otp_attempt, :disable_css, credential: {}])
  end

  def login_page_params