diff options
| author | Dmitriy Zaporozhets <dzaporozhets@sphereconsultinginc.com> | 2011-11-23 01:15:09 +0400 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dzaporozhets@sphereconsultinginc.com> | 2011-11-23 01:15:09 +0400 |
| commit | 7ebba27db21719c0035bab65fea92a4780051c73 (patch) | |
| tree | b121a7576af1503a96954ce9a94598a68579e053 | |
| parent | b56024100d40457a998f83adae3cdc830c997cda (diff) | |
| parent | a4fbe13fce87cb6ff2a27a2574ae25bf1dad145c (diff) | |
Merge branch 'master' of dev.gitlabhq.com:gitlabhqv1.2.1
| -rw-r--r-- | README.md | 4 | ||||
| -rw-r--r-- | app/models/key.rb | 2 | ||||
| -rw-r--r-- | app/views/keys/create.js.haml | 1 |
3 files changed, 6 insertions, 1 deletions
diff --git a/README.md b/README.md index 5f0095552dc..e6b85d65737 100644 --- 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 index 5fe30734476..8231c30ce1f 100644 --- 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 index 7b92be77180..a995c355e3c 100644 --- 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(); |