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

Fix project lookup in post receive

Browse source
This commit is contained in:
Dmitriy Zaporozhets 2012-12-08 20:48:33 +02:00
parent db7e0bf88d
commit 80e984ee5e
2 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
app/workers/post_receive.rb
View file

@ -1,12 +1,15 @@
class PostReceive class PostReceive
@queue = :post_receive @queue = :post_receive
def self.perform(reponame, oldrev, newrev, ref, identifier) def self.perform(repo_path, oldrev, newrev, ref, identifier)
project = Project.find_by_path(reponame) repo_path = repo_path.gsub(Gitlab.config.git_base_path, "")
repo_path = repo_path.gsub(/.git$/, "")
project = Project.find_with_namespace(repo_path)
return false if project.nil? return false if project.nil?
# Ignore push from non-gitlab users # Ignore push from non-gitlab users
user = if identifier.eql? Gitlab.config.gitolite_admin_key user = if identifier.eql? Gitlab.config.gitolite_admin_key
email = project.commit(newrev).author.email rescue nil email = project.commit(newrev).author.email rescue nil
User.find_by_email(email) if email User.find_by_email(email) if email
elsif /^[A-Z0-9._%a-z\-]+@(?:[A-Z0-9a-z\-]+\.)+[A-Za-z]{2,4}$/.match(identifier) elsif /^[A-Z0-9._%a-z\-]+@(?:[A-Z0-9a-z\-]+\.)+[A-Za-z]{2,4}$/.match(identifier)

5
lib/hooks/post-receive
View file

@ -6,7 +6,6 @@
while read oldrev newrev ref while read oldrev newrev ref
do do
# For every branch or tag that was pushed, create a Resque job in redis. # For every branch or tag that was pushed, create a Resque job in redis.
pwd=`pwd` repo_path=`pwd`
reponame=`basename "$pwd" | sed s/\.git$//` env -i redis-cli rpush "resque:gitlab:queue:post_receive" "{\"class\":\"PostReceive\",\"args\":[\"$repo_path\",\"$oldrev\",\"$newrev\",\"$ref\",\"$GL_USER\"]}" > /dev/null 2>&1
env -i redis-cli rpush "resque:gitlab:queue:post_receive" "{\"class\":\"PostReceive\",\"args\":[\"$reponame\",\"$oldrev\",\"$newrev\",\"$ref\",\"$GL_USER\"]}" > /dev/null 2>&1
done done