diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2023-04-03 17:21:33 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-03 17:21:33 +0200 |
| commit | 8192b0da7cd1fac38a68eab6746fc7ec74328a77 (patch) | |
| tree | 686c30ed5f6c4cfe5f6b4d84e46ff19f7baa6949 /app/controllers/auth/registrations_controller.rb | |
| parent | cbdb25ab0343603165fc89fd28b07c9ca0f2ae6d (diff) | |
| parent | 7b15f4006adb5f8f04d83174532c30eeb78757b0 (diff) | |
Merge pull request #2155 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/controllers/auth/registrations_controller.rb')
| -rw-r--r-- | app/controllers/auth/registrations_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/auth/registrations_controller.rb b/app/controllers/auth/registrations_controller.rb index 83e784e4c..d2f1bea93 100644 --- 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 |