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

2019-02-15 18:02:45 +01:00
parent 2769b54466 8ef50706a1
commit 06cc04fd23
30 changed files with 408 additions and 148 deletions
--- 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