diff options
| author | ThibG <thib@sitedethib.com> | 2019-02-16 13:43:23 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-16 13:43:23 +0100 |
| commit | ab9082b3325dfd193d7130d6c880e85ab2781bc0 (patch) | |
| tree | 7593823272a7b35bbb2ea41206349e107d31cd26 /app/controllers | |
| parent | 2769b5446681898e8332cb505f499dac2a6e5717 (diff) | |
| parent | 59fa38a4f6b9f19d674b3f9da97253b586814f94 (diff) | |
Merge pull request #916 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/auth/registrations_controller.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/controllers/auth/registrations_controller.rb b/app/controllers/auth/registrations_controller.rb index 11436d7c5..efe29b53f 100644 --- a/app/controllers/auth/registrations_controller.rb +++ b/app/controllers/auth/registrations_controller.rb @@ -29,6 +29,7 @@ class Auth::RegistrationsController < Devise::RegistrationsController resource.invite_code = params[:invite_code] if resource.invite_code.blank? resource.agreement = true + resource.current_sign_in_ip = request.remote_ip if resource.current_sign_in_ip.nil? resource.build_account if resource.account.nil? end |