diff options
| author | gitlabhq <m@gitlabhq.com> | 2011-10-18 11:21:44 +0300 |
|---|---|---|
| committer | gitlabhq <m@gitlabhq.com> | 2011-10-18 11:21:44 +0300 |
| commit | 5a5845e4908895ecb8ad60bfc964eaeecdcc43b2 (patch) | |
| tree | c339b916c9fca15cadbd1a559435cbdf81b0e3d5 | |
| parent | 2daa6161fd08e18bdf7f1ad0f30a83a58226543e (diff) | |
| download | gitlab-ce-5a5845e4908895ecb8ad60bfc964eaeecdcc43b2.tar.gz | |
few fixes
| -rw-r--r-- | app/models/project.rb | 2 | ||||
| -rw-r--r-- | app/views/projects/_form.html.haml | 2 | ||||
| -rw-r--r-- | lib/gitosis.rb | 15 |
3 files changed, 10 insertions, 9 deletions
diff --git a/app/models/project.rb b/app/models/project.rb index 3366b87816a..f51bd9b3ad4 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -29,7 +29,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 diff --git a/app/views/projects/_form.html.haml b/app/views/projects/_form.html.haml index 9dbe57d223f..00ca98efa08 100644 --- a/app/views/projects/_form.html.haml +++ b/app/views/projects/_form.html.haml @@ -24,7 +24,7 @@ %td .left= f.label :code %cite.right http://yourserver/ - %td= f.text_field :code, :placeholder => "example (3..12 symbols only)" + %td= f.text_field :code, :placeholder => "example" .field = f.label :description %br/ diff --git a/lib/gitosis.rb b/lib/gitosis.rb index a9eef96cd3f..cab7da2d435 100644 --- a/lib/gitosis.rb +++ b/lib/gitosis.rb @@ -27,13 +27,14 @@ 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) - - pull - yield(self) - push - - f.flock(File::LOCK_UN) + begin + f.flock(File::LOCK_EX) + pull + yield(self) + push + ensure + f.flock(File::LOCK_UN) + end end end rescue Exception => ex |