Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Léo-Paul Géneau
gitlab-ce
Commits
43b1f5e4
Commit
43b1f5e4
authored
Feb 20, 2017
by
Douglas Barbosa Alexandre
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Reuse User#find_by_any_email on UserFormatter#find_by_email
parent
20128693
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
10 deletions
+2
-10
lib/gitlab/github_import/user_formatter.rb
lib/gitlab/github_import/user_formatter.rb
+2
-10
No files found.
lib/gitlab/github_import/user_formatter.rb
View file @
43b1f5e4
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment