Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorValery Sizov <valery@gitlab.com>2015-02-05 21:31:36 +0300
committerValery Sizov <valery@gitlab.com>2015-02-06 04:03:43 +0300
commit1ac20698a5122111c8e12de4cc59da837b0f9573 (patch)
tree67442cc67cf4d7aa4f3e0c66d11d4728eb4fa8ca /lib/gitlab/gitlab_import
parent2d5765bd2ca9b7ce3e4251cb082cbc8c52e51996 (diff)
gitlab.com importer: refactorig
Diffstat (limited to 'lib/gitlab/gitlab_import')
-rw-r--r--lib/gitlab/gitlab_import/importer.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/gitlab_import/importer.rb b/lib/gitlab/gitlab_import/importer.rb
index a529483c1e2..5f9b14399a4 100644
--- a/lib/gitlab/gitlab_import/importer.rb
+++ b/lib/gitlab/gitlab_import/importer.rb
@@ -42,7 +42,7 @@ module Gitlab
private
def gl_user_id(project, gitlab_id)
- user = User.joins(:identities).find_by("identities.extern_uid = ?", gitlab_id.to_s)
+ user = User.joins(:identities).find_by("identities.extern_uid = ? AND identities.provider = 'gitlab'", gitlab_id.to_s)
(user && user.id) || project.creator_id
end
end