From 4d37329c732b394dd521a6568be6b7a5b4c3bd68 Mon Sep 17 00:00:00 2001 From: Kevin Lynch Date: Mon, 17 Oct 2011 01:53:30 -0400 Subject: [PATCH 1/2] Must ensure that the lock is always removed. --- lib/gitosis.rb | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/lib/gitosis.rb b/lib/gitosis.rb index a9eef96c..4cc5e6e3 100644 --- a/lib/gitosis.rb +++ b/lib/gitosis.rb @@ -27,13 +27,16 @@ class Gitosis def configure status = Timeout::timeout(20) do File.open(File.join(Dir.tmpdir,"gitlabhq-gitosis.lock"), "w+") do |f| - f.flock(File::LOCK_EX) + begin + f.flock(File::LOCK_EX) - pull - yield(self) - push + pull + yield(self) + push - f.flock(File::LOCK_UN) + ensure + f.flock(File::LOCK_UN) + end end end rescue Exception => ex From a39d0431cb2dec082cd5353f3c212833e49b3490 Mon Sep 17 00:00:00 2001 From: Kevin Lynch Date: Mon, 17 Oct 2011 18:35:25 -0400 Subject: [PATCH 2/2] The project name should not be limited to 16 characters. 16 is too short --- app/models/project.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/project.rb b/app/models/project.rb index 3c07976d..2340940b 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -28,7 +28,7 @@ class Project < ActiveRecord::Base :uniqueness => true, :format => { :with => /^[a-zA-Z0-9_\-]*$/, :message => "only letters, digits & '_' '-' allowed" }, - :length => { :within => 3..16 } + :length => { :within => 3..255 } validates :owner, :presence => true