diff --git a/lib/gitlab/github_import/user_formatter.rb b/lib/gitlab/github_import/user_formatter.rb index f0237d054dafd373dc0ac3af560f5e932fe88545..04c2964da204b8248e87da6ff7ea7b5279f52cfa 100644 --- a/lib/gitlab/github_import/user_formatter.rb +++ b/lib/gitlab/github_import/user_formatter.rb @@ -24,17 +24,9 @@ module Gitlab def find_by_email return nil unless email - users = ::User.arel_table - emails = ::Email.arel_table - left_join_emails = users.join(emails, Arel::Nodes::OuterJoin).on( - users[:id].eq(emails[:user_id]) - ).join_sources - - User.select(:id) - .joins(left_join_emails) - .where(users[:email].eq(email).or(emails[:email].eq(email))) - .first.try(:id) + User.find_by_any_email(email) + .try(:id) end def find_by_external_uid