Commit 7ebba27db21719c0035bab65fea92a4780051c73
Exists in
master
and in
4 other branches
Merge branch 'master' of dev.gitlabhq.com:gitlabhq
Showing
3 changed files
with
6 additions
and
1 deletions
Show diff stats
README.md
| @@ -71,6 +71,10 @@ ssh-keygen -t rsa | @@ -71,6 +71,10 @@ ssh-keygen -t rsa | ||
| 71 | sudo -H -u git gitosis-init < ~/.ssh/id_rsa.pub | 71 | sudo -H -u git gitosis-init < ~/.ssh/id_rsa.pub |
| 72 | 72 | ||
| 73 | sudo chmod 755 /home/git/repositories/gitosis-admin.git/hooks/post-update | 73 | sudo chmod 755 /home/git/repositories/gitosis-admin.git/hooks/post-update |
| 74 | + | ||
| 75 | +cd /tmp && git clone git@localhost:gitosis-admin.git | ||
| 76 | + | ||
| 77 | +rm -rf gitosis-admin.git && cd | ||
| 74 | ``` | 78 | ``` |
| 75 | 79 | ||
| 76 | ## Install ruby 1.9.2 | 80 | ## Install ruby 1.9.2 |
app/models/key.rb
| @@ -8,7 +8,7 @@ class Key < ActiveRecord::Base | @@ -8,7 +8,7 @@ class Key < ActiveRecord::Base | ||
| 8 | validates :key, | 8 | validates :key, |
| 9 | :presence => true, | 9 | :presence => true, |
| 10 | :uniqueness => true, | 10 | :uniqueness => true, |
| 11 | - :length => { :within => 0..1600 } | 11 | + :length => { :within => 0..5000 } |
| 12 | 12 | ||
| 13 | before_save :set_identifier | 13 | before_save :set_identifier |
| 14 | after_save :update_gitosis | 14 | after_save :update_gitosis |
app/views/keys/create.js.haml
| @@ -2,6 +2,7 @@ | @@ -2,6 +2,7 @@ | ||
| 2 | :plain | 2 | :plain |
| 3 | $("#new_key_dialog").dialog("close"); | 3 | $("#new_key_dialog").dialog("close"); |
| 4 | $("#keys-table").append("#{escape_javascript(render(:partial => 'show', :locals => {:key => @key} ))}"); | 4 | $("#keys-table").append("#{escape_javascript(render(:partial => 'show', :locals => {:key => @key} ))}"); |
| 5 | + $("#no_ssh_key_defined").hide(); | ||
| 5 | - else | 6 | - else |
| 6 | :plain | 7 | :plain |
| 7 | $("#new_key_dialog").empty(); | 8 | $("#new_key_dialog").empty(); |