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

riyad · Nov 22, 2011 · 7ebba27 · 7ebba27
2 parents b560241 + a4fbe13
commit 7ebba27
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1 deletion.
diff --git a/README.md b/README.md
@@ -71,6 +71,10 @@ ssh-keygen -t rsa
 sudo -H -u git gitosis-init < ~/.ssh/id_rsa.pub
 
 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

diff --git a/app/models/key.rb b/app/models/key.rb
@@ -8,7 +8,7 @@ class Key < ActiveRecord::Base
   validates :key,
             :presence => true,
             :uniqueness => true,
-            :length   => { :within => 0..1600 }
+            :length   => { :within => 0..5000 }
 
   before_save :set_identifier
   after_save :update_gitosis

diff --git a/app/views/keys/create.js.haml b/app/views/keys/create.js.haml
@@ -2,6 +2,7 @@
   :plain
     $("#new_key_dialog").dialog("close");
     $("#keys-table").append("#{escape_javascript(render(:partial => 'show', :locals => {:key => @key} ))}");
+    $("#no_ssh_key_defined").hide();
 - else
   :plain
     $("#new_key_dialog").empty();