Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'app/models/member.rb')
-rw-r--r--app/models/member.rb4
1 files changed, 3 insertions, 1 deletions
diff --git a/app/models/member.rb b/app/models/member.rb
index 5aa5655fc4a..dc2c8a37c0e 100644
--- a/app/models/member.rb
+++ b/app/models/member.rb
@@ -257,7 +257,9 @@ class Member < ApplicationRecord
def retrieve_user(user)
return user if user.is_a?(User)
- User.find_by(id: user) || User.find_by(email: user) || user
+ return User.find_by(id: user) if user.is_a?(Integer)
+
+ User.find_by(email: user) || user
end
def retrieve_member(source, user, existing_members)