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

Dmitriy Zaporozhets
2 parents b5602410 a4fbe13f
Showing 3 changed files with 6 additions and 1 deletions Show diff stats
README.md
app/models/key.rb
app/views/keys/create.js.haml
@@ -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
@@ -8,7 +8,7 @@ class Key &lt; ActiveRecord::Base
   validates :key,
             :presence => true,
             :uniqueness => true,
-            :length   => { :within => 0..1600 }
+            :length   => { :within => 0..5000 }
  
   before_save :set_identifier
   after_save :update_gitosis
@@ -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();
...	...	@@ -71,6 +71,10 @@ ssh-keygen -t rsa
71	71	sudo -H -u git gitosis-init < ~/.ssh/id_rsa.pub
72	72
73	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	80	## Install ruby 1.9.2
...	...
...	...	@@ -8,7 +8,7 @@ class Key < ActiveRecord::Base
8	8	validates :key,
9	9	:presence => true,
10	10	:uniqueness => true,
11		- :length => { :within => 0..1600 }
	11	+ :length => { :within => 0..5000 }
12	12
13	13	before_save :set_identifier
14	14	after_save :update_gitosis
...	...
...	...	@@ -2,6 +2,7 @@
2	2	:plain
3	3	$("#new_key_dialog").dialog("close");
4	4	$("#keys-table").append("#{escape_javascript(render(:partial => 'show', :locals => {:key => @key} ))}");
	5	+ $("#no_ssh_key_defined").hide();
5	6	- else
6	7	:plain
7	8	$("#new_key_dialog").empty();
...	...