Real fix for removing keys. Closes PR #1616

2985697a · Dmitriy Zaporozhets · 9e80d2d4 · 2985697a
隐藏空白更改
内联并排

Showing with 3 addition and 2 deletion

lib/gitlab/backend/gitolite_config.rb lib/gitlab/backend/gitolite_config.rb +3 -2

未找到文件。
--- a/lib/gitlab/backend/gitolite_config.rb
+++ b/lib/gitlab/backend/gitolite_config.rb
@@ -96,8 +96,9 @@ module Gitlab
    end

    def rm_key(user)
-      File.unlink(File.join(config_tmp_dir, 'gitolite/keydir',"#{user}.pub"))
-      `cd #{File.join(config_tmp_dir,'gitolite')} ; git rm keydir/#{user}.pub`
+      key_path = File.join(config_tmp_dir, 'gitolite/keydir', "#{user}.pub")
+      ga_key = ::Gitolite::SSHKey.from_file(key_path)
+      ga_repo.rm_key(ga_key)
    end

    # update or create