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

2023-04-01 14:31:05 +02:00
parent d874a7a10f 46483ae849
commit 7b15f4006a
7 changed files with 37 additions and 32 deletions
--- a/app/controllers/auth/registrations_controller.rb
+++ b/app/controllers/auth/registrations_controller.rb
@ -47,7 +47,7 @@ class Auth::RegistrationsController < Devise::RegistrationsController
    super(hash)

    resource.locale                 = I18n.locale
-    resource.invite_code            = params[:invite_code] if resource.invite_code.blank?
+    resource.invite_code            = @invite&.code if resource.invite_code.blank?
    resource.registration_form_time = session[:registration_form_time]
    resource.sign_up_ip             = request.remote_ip