Add latest changes from gitlab-org/gitlab@master

1 files changed, 10 insertions, 1 deletions

diff --git a/lib/gitlab/legacy_github_import/user_formatter.rb b/lib/gitlab/legacy_github_import/user_formatter.rb
index d45a166d2b7..8fd8354e59c 100644
--- a/lib/gitlab/legacy_github_import/user_formatter.rb
+++ b/lib/gitlab/legacy_github_import/user_formatter.rb
@@ -5,6 +5,8 @@ module Gitlab
     class UserFormatter
       attr_reader :client, :raw
 
+      GITEA_GHOST_EMAIL = 'ghost_user@gitea_import_dummy_email.com'
+
       def initialize(client, raw)
         @client = client
         @raw = raw
@@ -27,7 +29,14 @@ module Gitlab
       private
 
       def email
-        @email ||= client.user(raw[:login]).to_h[:email]
+        # Gitea marks deleted users as 'Ghost' users and removes them from
+        # their system. So for Gitea 'Ghost' users  we need to assign a dummy
+        # email address to avoid querying the Gitea api for a non existing user
+        if raw[:login] == 'Ghost' && raw[:id] == -1
+          @email = GITEA_GHOST_EMAIL
+        else
+          @email ||= client.user(raw[:login]).to_h[:email]
+        end
       end
 
       def find_by_email