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

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

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();