diff --git a/README.mkd b/README.mkd index 945b9cf82..d93614301 100755 --- a/README.mkd +++ b/README.mkd @@ -90,7 +90,7 @@ owner of these files to www-data and the permissions to 600 for the private key root directory: cd vendor/plugins - git clone https://github.com/ericpaulbishop/redmine_git_hosting.git + git clone https://Devoter@github.com/Devoter/redmine_git_hosting.git rm -rf redmine_git_hosting/.git cd ../.. diff --git a/app/controllers/gitolite_public_keys_controller.rb b/app/controllers/gitolite_public_keys_controller.rb index e11721d2b..6734989e1 100644 --- a/app/controllers/gitolite_public_keys_controller.rb +++ b/app/controllers/gitolite_public_keys_controller.rb @@ -12,6 +12,7 @@ def edit def delete @gitolite_public_key[:active] = 0 @gitolite_public_key.save + @gitolite_public_key.destroy redirect_to url_for(:controller => 'my', :action => 'account') end diff --git a/lib/git_hosting.rb b/lib/git_hosting.rb index 8bcea3432..7833b249c 100755 --- a/lib/git_hosting.rb +++ b/lib/git_hosting.rb @@ -412,7 +412,7 @@ def self.update_repositories(projects, is_repo_delete) users.map{|u| u.gitolite_public_keys.active}.flatten.compact.uniq.each do |key| filename = File.join(local_dir, 'gitolite-admin/keydir',"#{key.identifier}.pub") unless File.exists? filename - File.open(filename, 'w') {|f| f.write(key.key.gsub(/\n/,'')) } + File.open(filename, 'w') {|f| f.write(key.key.gsub(/\r\n/,"\n")) } changed = true end end