Commit 22f6e2d7 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge pull request #2009 from gitlabhq/hook_on_mr_fix

Fix hooks for merge requests which were accepted by web-interface
parents 36bbcc6f e226551e
...@@ -6,11 +6,15 @@ class PostReceive ...@@ -6,11 +6,15 @@ class PostReceive
return false if project.nil? return false if project.nil?
# Ignore push from non-gitlab users # Ignore push from non-gitlab users
if /^[A-Z0-9._%a-z\-]+@(?:[A-Z0-9a-z\-]+\.)+[A-Za-z]{2,4}$/.match(identifier) user = if identifier.eql? Gitlab.config.gitolite_admin_key
return false unless user = User.find_by_email(identifier) 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 else
return false unless user = Key.find_by_identifier(identifier).try(:user) Key.find_by_identifier(identifier).try(:user)
end end
return false unless user
project.trigger_post_receive(oldrev, newrev, ref, user) project.trigger_post_receive(oldrev, newrev, ref, user)
end end
......
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