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

few fixes

Browse source
This commit is contained in:
gitlabhq 2011-10-18 11:21:44 +03:00
parent 2daa6161fd
commit 5a5845e490
3 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/models/project.rb
View file

@ -29,7 +29,7 @@ class Project < ActiveRecord::Base
:uniqueness => true, :uniqueness => true,
:format => { :with => /^[a-zA-Z0-9_\-]*$/, :format => { :with => /^[a-zA-Z0-9_\-]*$/,
:message => "only letters, digits & '_' '-' allowed" }, :message => "only letters, digits & '_' '-' allowed" },
:length => { :within => 3..16 } :length => { :within => 3..255 }
validates :owner, validates :owner,
:presence => true :presence => true

2
app/views/projects/_form.html.haml
View file

@ -24,7 +24,7 @@
%td %td
.left= f.label :code .left= f.label :code
%cite.right http://yourserver/ %cite.right http://yourserver/
%td= f.text_field :code, :placeholder => "example (3..12 symbols only)" %td= f.text_field :code, :placeholder => "example"
.field .field
= f.label :description = f.label :description
%br/ %br/

15
lib/gitosis.rb
View file

@ -27,13 +27,14 @@ class Gitosis
def configure def configure
status = Timeout::timeout(20) do status = Timeout::timeout(20) do
File.open(File.join(Dir.tmpdir,"gitlabhq-gitosis.lock"), "w+") do |f| File.open(File.join(Dir.tmpdir,"gitlabhq-gitosis.lock"), "w+") do |f|
f.flock(File::LOCK_EX) begin
f.flock(File::LOCK_EX)
pull pull
yield(self) yield(self)
push push
ensure
f.flock(File::LOCK_UN) f.flock(File::LOCK_UN)
end
end end
end end
rescue Exception => ex rescue Exception => ex