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

Merge pull request #2009 from gitlabhq/hook_on_mr_fix

Browse source 
Fix hooks for merge requests which were accepted by web-interface
This commit is contained in:
Dmitriy Zaporozhets 2012-11-19 02:33:09 -08:00
parent 36bbcc6fd6 e226551e81
commit 22f6e2d765
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/workers/post_receive.rb
View file

@ -6,11 +6,15 @@ class PostReceive
return false if project.nil?
# Ignore push from non-gitlab users
if /^[A-Z0-9._%a-z\-]+@(?:[A-Z0-9a-z\-]+\.)+[A-Za-z]{2,4}$/.match(identifier)
return false unless user = User.find_by_email(identifier)
user = if identifier.eql? Gitlab.config.gitolite_admin_key
email = project.commit(newrev).author.email
User.find_by_email(email)
elsif /^[A-Z0-9._%a-z\-]+@(?:[A-Z0-9a-z\-]+\.)+[A-Za-z]{2,4}$/.match(identifier)
User.find_by_email(identifier)
else
return false unless user = Key.find_by_identifier(identifier).try(:user)
Key.find_by_identifier(identifier).try(:user)
end
return false unless user
project.trigger_post_receive(oldrev, newrev, ref, user)
end