Merge branch 'develop' into staging

2017-01-13 11:19:38 +01:00 · 2017-01-13 11:19:38 +01:00 · bfe1d7469d
commit bfe1d7469d
parent eeb5c89b13 154e4f3c10
1 changed files with 1 additions and 2 deletions
--- a/app/controllers/users/registrations_controller.rb
+++ b/app/controllers/users/registrations_controller.rb
@ -68,7 +68,6 @@ class Users::RegistrationsController < Devise::RegistrationsController
  private

  def check_invite! user
-    Invite.where(email: user.email)
-        .each { |invite| invite.update user: user }
+    Invite.where(email: user.email).update_all user_id: user.id
  end
 end