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

Fix satellites to use filesystem. Correct post-receive user finder

Browse source
This commit is contained in:
Dmitriy Zaporozhets 2013-02-04 16:19:37 +02:00
parent 896c3a0a9d
commit 6f7ccea668
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/workers/post_receive.rb
View file

@ -28,10 +28,13 @@ class PostReceive
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)
User.find_by_email(identifier) User.find_by_email(identifier)
else else
Key.find_by_identifier(identifier).try(:user) User.find_by_username(identifier.strip)
end end
return false unless user unless user
Gitlab::GitLogger.error("POST-RECEIVE: Triggered hook for non-existing user \"#{identifier} \"")
return false
end
project.trigger_post_receive(oldrev, newrev, ref, user) project.trigger_post_receive(oldrev, newrev, ref, user)
end end

4
lib/gitlab/satellite/satellite.rb
View file

@ -30,10 +30,10 @@ module Gitlab
end end
def create def create
output, status = popen("git clone #{project.url_to_repo} #{path}", output, status = popen("git clone #{project.repository.path_to_repo} #{path}",
Gitlab.config.satellites.path) Gitlab.config.satellites.path)
log("PID: #{project.id}: git clone #{project.url_to_repo} #{path}") log("PID: #{project.id}: git clone #{project.repository.path_to_repo} #{path}")
log("PID: #{project.id}: -> #{output}") log("PID: #{project.id}: -> #{output}")
if status.zero? if status.zero?