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
Boxiang Sun
gitlab-ce
Commits
2b7328c3
Commit
2b7328c3
authored
Apr 24, 2017
by
Douglas Barbosa Alexandre
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Rename find_by_email/find_by_external_uid methods
parent
e50606cd
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
+3
-3
lib/github/import.rb
lib/github/import.rb
+3
-3
No files found.
lib/github/import.rb
View file @
2b7328c3
...
@@ -338,19 +338,19 @@ module Github
...
@@ -338,19 +338,19 @@ module Github
return
unless
user
.
present?
return
unless
user
.
present?
return
cached_user_ids
[
user
.
id
]
if
cached_user_ids
.
key?
(
user
.
id
)
return
cached_user_ids
[
user
.
id
]
if
cached_user_ids
.
key?
(
user
.
id
)
gitlab_user_id
=
find_by_external_uid
(
user
.
id
)
||
fin
d_by_email
(
user
.
email
)
gitlab_user_id
=
user_id_by_external_uid
(
user
.
id
)
||
user_i
d_by_email
(
user
.
email
)
cached_gitlab_users
[
user
.
id
]
=
gitlab_user_id
.
present?
cached_gitlab_users
[
user
.
id
]
=
gitlab_user_id
.
present?
cached_user_ids
[
user
.
id
]
=
gitlab_user_id
||
fallback_id
cached_user_ids
[
user
.
id
]
=
gitlab_user_id
||
fallback_id
end
end
def
fin
d_by_email
(
email
)
def
user_i
d_by_email
(
email
)
return
nil
unless
email
return
nil
unless
email
::
User
.
find_by_any_email
(
email
)
&
.
id
::
User
.
find_by_any_email
(
email
)
&
.
id
end
end
def
fin
d_by_external_uid
(
id
)
def
user_i
d_by_external_uid
(
id
)
return
nil
unless
id
return
nil
unless
id
identities
=
::
Identity
.
arel_table
identities
=
::
Identity
.
arel_table
...
...
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