Reuse User#find_by_any_email on UserFormatter#find_by_email

parent 20128693
...@@ -24,17 +24,9 @@ module Gitlab ...@@ -24,17 +24,9 @@ module Gitlab
def find_by_email def find_by_email
return nil unless email return nil unless email
users = ::User.arel_table
emails = ::Email.arel_table
left_join_emails = users.join(emails, Arel::Nodes::OuterJoin).on( User.find_by_any_email(email)
users[:id].eq(emails[:user_id]) .try(:id)
).join_sources
User.select(:id)
.joins(left_join_emails)
.where(users[:email].eq(email).or(emails[:email].eq(email)))
.first.try(:id)
end end
def find_by_external_uid def find_by_external_uid
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment