Commit 7ebba27d authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

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

parents b5602410 a4fbe13f
...@@ -71,6 +71,10 @@ ssh-keygen -t rsa ...@@ -71,6 +71,10 @@ ssh-keygen -t rsa
sudo -H -u git gitosis-init < ~/.ssh/id_rsa.pub sudo -H -u git gitosis-init < ~/.ssh/id_rsa.pub
sudo chmod 755 /home/git/repositories/gitosis-admin.git/hooks/post-update 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 ## Install ruby 1.9.2
......
...@@ -8,7 +8,7 @@ class Key < ActiveRecord::Base ...@@ -8,7 +8,7 @@ class Key < ActiveRecord::Base
validates :key, validates :key,
:presence => true, :presence => true,
:uniqueness => true, :uniqueness => true,
:length => { :within => 0..1600 } :length => { :within => 0..5000 }
before_save :set_identifier before_save :set_identifier
after_save :update_gitosis after_save :update_gitosis
......
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
:plain :plain
$("#new_key_dialog").dialog("close"); $("#new_key_dialog").dialog("close");
$("#keys-table").append("#{escape_javascript(render(:partial => 'show', :locals => {:key => @key} ))}"); $("#keys-table").append("#{escape_javascript(render(:partial => 'show', :locals => {:key => @key} ))}");
$("#no_ssh_key_defined").hide();
- else - else
:plain :plain
$("#new_key_dialog").empty(); $("#new_key_dialog").empty();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment