summaryrefslogtreecommitdiff
path: root/lib/gitlab
diff options
context:
space:
mode:
authorSean McGivern <sean@mcgivern.me.uk>2016-11-23 12:45:11 +0000
committerSean McGivern <sean@mcgivern.me.uk>2016-11-23 12:45:11 +0000
commit1a45de3d4559a2f92e099a43490e9c50fe4bc86e (patch)
tree47200f6975e8604f62cb69e742e83789c2822370 /lib/gitlab
parentba0d4877934349603e24125864c3a46eba271e0e (diff)
parentb9176afbc887b2bac4e07fdad65f3560cc3ceedf (diff)
downloadgitlab-ce-1a45de3d4559a2f92e099a43490e9c50fe4bc86e.tar.gz
Merge branch 'post_receive-any-email' into 'master'
post_receive: accept any user email from last commit See merge request !7225
Diffstat (limited to 'lib/gitlab')
-rw-r--r--lib/gitlab/identifier.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/identifier.rb b/lib/gitlab/identifier.rb
index f8809db21aa..c5acf18beb5 100644
--- a/lib/gitlab/identifier.rb
+++ b/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