kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch 'bitbucket-oauth2' of gitlab.com:gitlab-org/gitlab-ce into bitbucket-oauth2

This commit is contained in:
Achilleas Pipinellis 2016-12-16 14:56:13 +01:00
parent 27f271ee1e fc42f969c4
commit 5e2f68e555
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/gitlab/bitbucket_import/importer.rb
View File

@ -28,6 +28,7 @@ module Gitlab
def handle_errors
return unless errors.any?
project.update_column(:import_error, {
message: 'The remote data could not be fully imported.',
errors: errors
@ -35,15 +36,12 @@ module Gitlab
end
def gitlab_user_id(project, username)
if username
user = find_user(username)
(user && user.id) || project.creator_id
else
project.creator_id
end
user = find_user(username)
user.try(:id) || project.creator_id
end
def find_user(username)
return nil unless username
User.joins(:identities).find_by("identities.extern_uid = ? AND identities.provider = 'bitbucket'", username)
end