1 files changed, 9 insertions, 3 deletions
diff --git a/lib/gitlab/legacy_github_import/user_formatter.rb b/lib/gitlab/legacy_github_import/user_formatter.rb
index 7ae1b195ec6..d45a166d2b7 100644
--- a/lib/gitlab/legacy_github_import/user_formatter.rb
+++ b/lib/gitlab/legacy_github_import/user_formatter.rb
@@ -5,13 +5,19 @@ module Gitlab
     class UserFormatter
       attr_reader :client, :raw
 
-      delegate :id, :login, to: :raw, allow_nil: true
-
       def initialize(client, raw)
         @client = client
         @raw = raw
       end
 
+      def id
+        raw[:id]
+      end
+
+      def login
+        raw[:login]
+      end
+
       def gitlab_id
         return @gitlab_id if defined?(@gitlab_id)
 
@@ -21,7 +27,7 @@ module Gitlab
       private
 
       def email
-        @email ||= client.user(raw.login).try(:email)
+        @email ||= client.user(raw[:login]).to_h[:email]
       end
 
       def find_by_email