deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #2119 from erroric/fix_issue2118

Browse source 
issue #2118: fix undefined method  for nil:NilClass exception
This commit is contained in:
Valeriy Sizov 2012-11-30 01:19:29 -08:00
parent cf12763d5b c954f2d982
commit a03f318964
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/workers/post_receive.rb
View file

@ -7,8 +7,8 @@ class PostReceive
# 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