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

Merge branch 'master' of dev.gitlabhq.com:gitlabhq

Browse source
This commit is contained in:
Dmitriy Zaporozhets 2011-11-22 23:15:09 +02:00
parent b56024100d a4fbe13fce
commit 7ebba27db2
3 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
README.md
View file

@ -71,6 +71,10 @@ ssh-keygen -t rsa
sudo -H -u git gitosis-init < ~/.ssh/id_rsa.pub sudo -H -u git gitosis-init < ~/.ssh/id_rsa.pub
sudo chmod 755 /home/git/repositories/gitosis-admin.git/hooks/post-update sudo chmod 755 /home/git/repositories/gitosis-admin.git/hooks/post-update
cd /tmp && git clone git@localhost:gitosis-admin.git
rm -rf gitosis-admin.git && cd
``` ```
## Install ruby 1.9.2 ## Install ruby 1.9.2

2
app/models/key.rb
View file

@ -8,7 +8,7 @@ class Key < ActiveRecord::Base
validates :key, validates :key,
:presence => true, :presence => true,
:uniqueness => true, :uniqueness => true,
:length => { :within => 0..1600 } :length => { :within => 0..5000 }
before_save :set_identifier before_save :set_identifier
after_save :update_gitosis after_save :update_gitosis

1
app/views/keys/create.js.haml
View file

@ -2,6 +2,7 @@
:plain :plain
$("#new_key_dialog").dialog("close"); $("#new_key_dialog").dialog("close");
$("#keys-table").append("#{escape_javascript(render(:partial => 'show', :locals => {:key => @key} ))}"); $("#keys-table").append("#{escape_javascript(render(:partial => 'show', :locals => {:key => @key} ))}");
$("#no_ssh_key_defined").hide();
- else - else
:plain :plain
$("#new_key_dialog").empty(); $("#new_key_dialog").empty();