Add latest changes from gitlab-org/gitlab@master

1 files changed, 1 insertions, 6 deletions

diff --git a/lib/gitlab/legacy_github_import/user_formatter.rb b/lib/gitlab/legacy_github_import/user_formatter.rb
index e85d1314eda..7ae1b195ec6 100644
--- a/lib/gitlab/legacy_github_import/user_formatter.rb
+++ b/lib/gitlab/legacy_github_import/user_formatter.rb
@@ -35,12 +35,7 @@ module Gitlab
       def find_by_external_uid
         return unless id
 
-        identities = ::Identity.arel_table
-
-        User.select(:id)
-            .joins(:identities)
-            .find_by(identities[:provider].eq(:github).and(identities[:extern_uid].eq(id)))
-            .try(:id)
+        User.by_provider_and_extern_uid(:github, id).select(:id).first&.id
       end
       # rubocop: enable CodeReuse/ActiveRecord
     end