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
Jérome Perrin
gitlab-ce
Commits
d20a9132
Commit
d20a9132
authored
Aug 03, 2017
by
Douglas Barbosa Alexandre
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix Github::Import cache for user ids
parent
cb08cb22
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
1 deletion
+1
-1
lib/github/import.rb
lib/github/import.rb
+1
-1
No files found.
lib/github/import.rb
View file @
d20a9132
...
@@ -339,7 +339,7 @@ module Github
...
@@ -339,7 +339,7 @@ module Github
def
user_id
(
user
,
fallback_id
=
nil
)
def
user_id
(
user
,
fallback_id
=
nil
)
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
]
[
user
.
id
].
present?
gitlab_user_id
=
user_id_by_external_uid
(
user
.
id
)
||
user_id_by_email
(
user
.
email
)
gitlab_user_id
=
user_id_by_external_uid
(
user
.
id
)
||
user_id_by_email
(
user
.
email
)
...
...
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