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

2024-05-31 08:27:09 +09:00 · 2024-05-31 08:27:09 +09:00 · 13ad383039
commit 13ad383039
parent f3f9e5d545 7f808ff6e9
101 changed files with 1486 additions and 1232 deletions
--- a/app/controllers/auth/registrations_controller.rb
+++ b/app/controllers/auth/registrations_controller.rb
@ -44,7 +44,7 @@ class Auth::RegistrationsController < Devise::RegistrationsController
  end

  def build_resource(hash = nil)
-    super(hash)
+    super

    resource.locale                 = I18n.locale
    resource.invite_code            = @invite&.code if resource.invite_code.blank?