User#ldap_email? is gone

lib/gitlab/ldap/access.rb

@@ -70,7 +70,7 @@ module Gitlab
         found_user = Gitlab::LDAP::Person.find_by_dn(ldap_identity.extern_uid, adapter)
         return found_user if found_user
 
-        if user.ldap_email?
+        if user.external_email? && [nil, provider].include?(user.email_provider)
           Gitlab::LDAP::Person.find_by_email(user.email, adapter)
         end
       end

spec/lib/gitlab/ldap/access_spec.rb

@@ -15,7 +15,7 @@ describe Gitlab::LDAP::Access, lib: true do
 
     it 'finds a user by email if the email came from LDAP' do
       expect(Gitlab::LDAP::Person).to receive(:find_by_dn).and_return(nil)
-      expect(user).to receive(:ldap_email?).and_return(true)
+      expect(user).to receive(:external_email?).and_return(true)
       expect(Gitlab::LDAP::Person).to receive(:find_by_email)
 
       access.find_ldap_user