Commit a03f3189 authored by Valeriy Sizov's avatar Valeriy Sizov
Browse files

Merge pull request #2119 from erroric/fix_issue2118

issue #2118: fix undefined method  for nil:NilClass exception
......@@ -7,8 +7,8 @@ def self.perform(reponame, oldrev, newrev, ref, identifier)
# Ignore push from non-gitlab users
user = if identifier.eql? Gitlab.config.gitolite_admin_key
email = project.commit(newrev).author.email
User.find_by_email(email)
email = project.commit(newrev).author.email rescue nil
User.find_by_email(email) if email
elsif /^[A-Z0-9._%a-z\-]+@(?:[A-Z0-9a-z\-]+\.)+[A-Za-z]{2,4}$/.match(identifier)
User.find_by_email(identifier)
else
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment