Restrict to confirmed users and allow memoization of unkonwn e-mails

7b23b550 · Stan Hu · a5722c37 · 7b23b550
Commit 7b23b550 authored Jul 28, 2018 by Stan Hu
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

lib/gitlab/bitbucket_server_import/importer.rb lib/gitlab/bitbucket_server_import/importer.rb +2 -2

No files found.
--- a/lib/gitlab/bitbucket_server_import/importer.rb
+++ b/lib/gitlab/bitbucket_server_import/importer.rb
@@ -64,8 +64,8 @@ module Gitlab
        return users[email] if users.key?(email)
-        user = User.find_by_any_email(email)
+        user = User.find_by_any_email(email, confirmed: true)
-        users[email] = user&.id if user
+        users[email] = user&.id
        user&.id
      end