From 35fb45749d3a7f90daa77f36a7f668e05e4d8c49 Mon Sep 17 00:00:00 2001
From: Arpit Jalan <arpit@techapj.com>
Date: Tue, 11 Jul 2017 13:20:56 +0530
Subject: [PATCH] FIX: remove unneeded code
---
app/models/invite_redeemer.rb | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/app/models/invite_redeemer.rb b/app/models/invite_redeemer.rb
index df748bf32bc..8205cb549e2 100644
--- a/app/models/invite_redeemer.rb
+++ b/app/models/invite_redeemer.rb
@@ -19,9 +19,6 @@ InviteRedeemer = Struct.new(:invite, :username, :name, :password, :user_custom_f
# extracted from User cause it is very specific to invites
def self.create_user_from_invite(invite, username, name, password=nil, user_custom_fields=nil)
- user_exists = User.where(admin: false).find_by_email(invite.email)
- return user if user_exists
-
if username && UsernameValidator.new(username).valid_format? && User.username_available?(username)
available_username = username
else
@@ -94,7 +91,7 @@ InviteRedeemer = Struct.new(:invite, :username, :name, :password, :user_custom_f
end
def get_existing_user
- User.find_by(email: invite.email)
+ User.where(admin: false).find_by(email: invite.email)
end