Merge branch 'post_receive-any-email' into 'master'

post_receive: accept any user email from last commit

See merge request !7225

changelogs/unreleased/post_receive-any-email.yml

+---
+title: "post_receive: accept any user email from last commit"
+merge_request: 7225
+author: Elan Ruusamäe

lib/gitlab/identifier.rb

@@ -24,7 +24,7 @@ module Gitlab
       email = commit.author_email
 
       identify_with_cache(:email, email) do
-        User.find_by(email: email)
+        User.find_by_any_email(email)
       end
     end
 

spec/lib/gitlab/identifier_spec.rb

@@ -65,7 +65,7 @@ describe Gitlab::Identifier do
       commit = double(:commit, author_email: user.email)
 
       expect(project).to receive(:commit).with('123').twice.and_return(commit)
-      expect(User).to receive(:find_by).once.and_call_original
+      expect(User).to receive(:find_by_any_email).once.and_call_original
 
       2.times do
         expect(identifier.identify_using_commit(project, '123')).to eq(user)